diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/CHANGELOG.md b/sdk/securityinsights/azure-resourcemanager-securityinsights/CHANGELOG.md
index 51d1f53d4466..1b8fed04f969 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/CHANGELOG.md
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Release History
 
-## 1.0.0-beta.5 (Unreleased)
+## 1.0.0-beta.1 (2022-10-25)
+
+- Azure Resource Manager SecurityInsights client library for Java. This package contains Microsoft Azure SDK for SecurityInsights Management SDK. API spec for Microsoft.SecurityInsights (Azure Security Insights) resource provider. Package tag package-preview-2023-03. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ### Features Added
 
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/README.md b/sdk/securityinsights/azure-resourcemanager-securityinsights/README.md
index be7cd5eb6b9e..5ed1c1a23acd 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/README.md
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/README.md
@@ -2,7 +2,7 @@
 
 Azure Resource Manager SecurityInsights client library for Java.
 
-This package contains Microsoft Azure SDK for SecurityInsights Management SDK. API spec for Microsoft.SecurityInsights (Azure Security Insights) resource provider. Package tag package-preview-2022-09. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+This package contains Microsoft Azure SDK for SecurityInsights Management SDK. API spec for Microsoft.SecurityInsights (Azure Security Insights) resource provider. Package tag package-preview-2023-03. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ## We'd love to hear your feedback
 
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-securityinsights</artifactId>
-    <version>1.0.0-beta.4</version>
+    <version>1.0.0-beta.5</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/SAMPLE.md b/sdk/securityinsights/azure-resourcemanager-securityinsights/SAMPLE.md
index dec6f55e9756..3eb934eb9df0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/SAMPLE.md
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/SAMPLE.md
@@ -212,13 +212,20 @@
 - [Delete](#watchlists_delete)
 - [Get](#watchlists_get)
 - [List](#watchlists_list)
+
+## WorkspaceManagerConfigurations
+
+- [CreateOrUpdate](#workspacemanagerconfigurations_createorupdate)
+- [Delete](#workspacemanagerconfigurations_delete)
+- [Get](#workspacemanagerconfigurations_get)
+- [List](#workspacemanagerconfigurations_list)
 ### Actions_CreateOrUpdate
 
 ```java
 /** Samples for Actions CreateOrUpdate. */
 public final class ActionsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/actions/CreateActionOfAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/actions/CreateActionOfAlertRule.json
      */
     /**
      * Sample code: Creates or updates an action of alert rule.
@@ -249,7 +256,7 @@ import com.azure.core.util.Context;
 /** Samples for Actions Delete. */
 public final class ActionsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/actions/DeleteActionOfAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/actions/DeleteActionOfAlertRule.json
      */
     /**
      * Sample code: Delete an action of alert rule.
@@ -278,7 +285,7 @@ import com.azure.core.util.Context;
 /** Samples for Actions Get. */
 public final class ActionsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/actions/GetActionOfAlertRuleById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/actions/GetActionOfAlertRuleById.json
      */
     /**
      * Sample code: Get an action of alert rule.
@@ -307,7 +314,7 @@ import com.azure.core.util.Context;
 /** Samples for Actions ListByAlertRule. */
 public final class ActionsListByAlertRuleSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/actions/GetAllActionsByAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/actions/GetAllActionsByAlertRule.json
      */
     /**
      * Sample code: Get all actions of alert rule.
@@ -329,7 +336,7 @@ import com.azure.core.util.Context;
 /** Samples for AlertRuleTemplates Get. */
 public final class AlertRuleTemplatesGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRuleTemplates/GetAlertRuleTemplateById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRuleTemplates/GetAlertRuleTemplateById.json
      */
     /**
      * Sample code: Get alert rule template by Id.
@@ -353,7 +360,7 @@ import com.azure.core.util.Context;
 /** Samples for AlertRuleTemplates List. */
 public final class AlertRuleTemplatesListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRuleTemplates/GetAlertRuleTemplates.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRuleTemplates/GetAlertRuleTemplates.json
      */
     /**
      * Sample code: Get all alert rule templates.
@@ -373,6 +380,8 @@ public final class AlertRuleTemplatesListSamples {
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.securityinsights.models.AlertDetail;
 import com.azure.resourcemanager.securityinsights.models.AlertDetailsOverride;
+import com.azure.resourcemanager.securityinsights.models.AlertProperty;
+import com.azure.resourcemanager.securityinsights.models.AlertPropertyMapping;
 import com.azure.resourcemanager.securityinsights.models.AlertSeverity;
 import com.azure.resourcemanager.securityinsights.models.AttackTactic;
 import com.azure.resourcemanager.securityinsights.models.EntityMapping;
@@ -392,6 +401,7 @@ import com.azure.resourcemanager.securityinsights.models.MicrosoftSecurityIncide
 import com.azure.resourcemanager.securityinsights.models.MicrosoftSecurityProductName;
 import com.azure.resourcemanager.securityinsights.models.NrtAlertRule;
 import com.azure.resourcemanager.securityinsights.models.ScheduledAlertRule;
+import com.azure.resourcemanager.securityinsights.models.SentinelEntityMapping;
 import com.azure.resourcemanager.securityinsights.models.TriggerOperator;
 import java.time.Duration;
 import java.util.Arrays;
@@ -401,7 +411,7 @@ import java.util.Map;
 /** Samples for AlertRules CreateOrUpdate. */
 public final class AlertRulesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/CreateFusionAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/CreateFusionAlertRule.json
      */
     /**
      * Sample code: Creates or updates a Fusion alert rule.
@@ -624,7 +634,7 @@ public final class AlertRulesCreateOrUpdateSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/CreateMicrosoftSecurityIncidentCreationAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/CreateMicrosoftSecurityIncidentCreationAlertRule.json
      */
     /**
      * Sample code: Creates or updates a MicrosoftSecurityIncidentCreation rule.
@@ -648,7 +658,7 @@ public final class AlertRulesCreateOrUpdateSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/CreateScheduledAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/CreateScheduledAlertRule.json
      */
     /**
      * Sample code: Creates or updates a Scheduled alert rule.
@@ -716,12 +726,26 @@ public final class AlertRulesCreateOrUpdateSamples {
                     .withAlertDetailsOverride(
                         new AlertDetailsOverride()
                             .withAlertDisplayNameFormat("Alert from {{Computer}}")
-                            .withAlertDescriptionFormat("Suspicious activity was made by {{ComputerIP}}")),
+                            .withAlertDescriptionFormat("Suspicious activity was made by {{ComputerIP}}")
+                            .withAlertDynamicProperties(
+                                Arrays
+                                    .asList(
+                                        new AlertPropertyMapping()
+                                            .withAlertProperty(AlertProperty.PRODUCT_COMPONENT_NAME)
+                                            .withValue("ProductComponentNameCustomColumn"),
+                                        new AlertPropertyMapping()
+                                            .withAlertProperty(AlertProperty.PRODUCT_NAME)
+                                            .withValue("ProductNameCustomColumn"),
+                                        new AlertPropertyMapping()
+                                            .withAlertProperty(AlertProperty.ALERT_LINK)
+                                            .withValue("Link"))))
+                    .withSentinelEntitiesMappings(
+                        Arrays.asList(new SentinelEntityMapping().withColumnName("Entities"))),
                 Context.NONE);
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/CreateFusionAlertRuleWithFusionScenarioExclusion.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/CreateFusionAlertRuleWithFusionScenarioExclusion.json
      */
     /**
      * Sample code: Creates or updates a Fusion alert rule with scenario exclusion pattern.
@@ -944,7 +968,7 @@ public final class AlertRulesCreateOrUpdateSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/CreateNrtAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/CreateNrtAlertRule.json
      */
     /**
      * Sample code: Creates or updates a Nrt alert rule.
@@ -1009,7 +1033,7 @@ import com.azure.core.util.Context;
 /** Samples for AlertRules Delete. */
 public final class AlertRulesDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/DeleteAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/DeleteAlertRule.json
      */
     /**
      * Sample code: Delete an alert rule.
@@ -1032,7 +1056,7 @@ import com.azure.core.util.Context;
 /** Samples for AlertRules Get. */
 public final class AlertRulesGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/GetScheduledAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/GetScheduledAlertRule.json
      */
     /**
      * Sample code: Get a Scheduled alert rule.
@@ -1047,7 +1071,7 @@ public final class AlertRulesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/GetNrtAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/GetNrtAlertRule.json
      */
     /**
      * Sample code: Get an Nrt alert rule.
@@ -1061,7 +1085,7 @@ public final class AlertRulesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/GetFusionAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/GetFusionAlertRule.json
      */
     /**
      * Sample code: Get a Fusion alert rule.
@@ -1073,7 +1097,7 @@ public final class AlertRulesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/GetMicrosoftSecurityIncidentCreationAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/GetMicrosoftSecurityIncidentCreationAlertRule.json
      */
     /**
      * Sample code: Get a MicrosoftSecurityIncidentCreation rule.
@@ -1097,7 +1121,7 @@ import com.azure.core.util.Context;
 /** Samples for AlertRules List. */
 public final class AlertRulesListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/GetAllAlertRules.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/GetAllAlertRules.json
      */
     /**
      * Sample code: Get all alert rules.
@@ -1120,7 +1144,7 @@ import java.util.List;
 /** Samples for AutomationRules CreateOrUpdate. */
 public final class AutomationRulesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/automationRules/AutomationRules_CreateOrUpdate.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/automationRules/AutomationRules_CreateOrUpdate.json
      */
     /**
      * Sample code: AutomationRules_CreateOrUpdate.
@@ -1150,7 +1174,7 @@ import com.azure.core.util.Context;
 /** Samples for AutomationRules Delete. */
 public final class AutomationRulesDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/automationRules/AutomationRules_Delete.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/automationRules/AutomationRules_Delete.json
      */
     /**
      * Sample code: AutomationRules_Delete.
@@ -1174,7 +1198,7 @@ import com.azure.core.util.Context;
 /** Samples for AutomationRules Get. */
 public final class AutomationRulesGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/automationRules/AutomationRules_Get.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/automationRules/AutomationRules_Get.json
      */
     /**
      * Sample code: AutomationRules_Get.
@@ -1197,7 +1221,7 @@ import com.azure.core.util.Context;
 /** Samples for AutomationRules List. */
 public final class AutomationRulesListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/automationRules/AutomationRules_List.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/automationRules/AutomationRules_List.json
      */
     /**
      * Sample code: AutomationRules_List.
@@ -1221,7 +1245,7 @@ import java.util.UUID;
 /** Samples for BookmarkOperation Expand. */
 public final class BookmarkOperationExpandSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/expand/PostExpandBookmark.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/expand/PostExpandBookmark.json
      */
     /**
      * Sample code: Expand an bookmark.
@@ -1250,7 +1274,7 @@ public final class BookmarkOperationExpandSamples {
 /** Samples for BookmarkRelations CreateOrUpdate. */
 public final class BookmarkRelationsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/relations/CreateBookmarkRelation.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/relations/CreateBookmarkRelation.json
      */
     /**
      * Sample code: Creates or updates a bookmark relation.
@@ -1278,7 +1302,7 @@ import com.azure.core.util.Context;
 /** Samples for BookmarkRelations Delete. */
 public final class BookmarkRelationsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/relations/DeleteBookmarkRelation.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/relations/DeleteBookmarkRelation.json
      */
     /**
      * Sample code: Delete the bookmark relation.
@@ -1307,7 +1331,7 @@ import com.azure.core.util.Context;
 /** Samples for BookmarkRelations Get. */
 public final class BookmarkRelationsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/relations/GetBookmarkRelationByName.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/relations/GetBookmarkRelationByName.json
      */
     /**
      * Sample code: Get a bookmark relation.
@@ -1336,7 +1360,7 @@ import com.azure.core.util.Context;
 /** Samples for BookmarkRelations List. */
 public final class BookmarkRelationsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/relations/GetAllBookmarkRelations.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/relations/GetAllBookmarkRelations.json
      */
     /**
      * Sample code: Get all bookmark relations.
@@ -1366,7 +1390,7 @@ import java.util.UUID;
 /** Samples for Bookmarks CreateOrUpdate. */
 public final class BookmarksCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/CreateBookmark.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/CreateBookmark.json
      */
     /**
      * Sample code: Creates or updates a bookmark.
@@ -1415,7 +1439,7 @@ import com.azure.core.util.Context;
 /** Samples for Bookmarks Delete. */
 public final class BookmarksDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/DeleteBookmark.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/DeleteBookmark.json
      */
     /**
      * Sample code: Delete a bookmark.
@@ -1438,7 +1462,7 @@ import com.azure.core.util.Context;
 /** Samples for Bookmarks Get. */
 public final class BookmarksGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/GetBookmarkById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/GetBookmarkById.json
      */
     /**
      * Sample code: Get a bookmark.
@@ -1461,7 +1485,7 @@ import com.azure.core.util.Context;
 /** Samples for Bookmarks List. */
 public final class BookmarksListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/GetBookmarks.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/GetBookmarks.json
      */
     /**
      * Sample code: Get all bookmarks.
@@ -1488,7 +1512,7 @@ import java.util.Arrays;
 /** Samples for DataConnectors Connect. */
 public final class DataConnectorsConnectSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/ConnectAPIPollingV2Logs.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/ConnectAPIPollingV2Logs.json
      */
     /**
      * Sample code: Connect an APIPolling V2 logs data connector.
@@ -1523,7 +1547,7 @@ public final class DataConnectorsConnectSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/ConnectAPIPolling.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/ConnectAPIPolling.json
      */
     /**
      * Sample code: Connect an APIPolling data connector.
@@ -1615,7 +1639,7 @@ import java.util.Arrays;
 /** Samples for DataConnectors CreateOrUpdate. */
 public final class DataConnectorsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CreateOfficeDataConnetor.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CreateOfficeDataConnetor.json
      */
     /**
      * Sample code: Creates or updates an Office365 data connector.
@@ -1643,7 +1667,7 @@ public final class DataConnectorsCreateOrUpdateSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CreateOfficePowerBIDataConnector.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CreateOfficePowerBIDataConnector.json
      */
     /**
      * Sample code: Creates or updates an Office PowerBI data connector.
@@ -1668,7 +1692,7 @@ public final class DataConnectorsCreateOrUpdateSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CreateThreatIntelligenceTaxiiDataConnector.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CreateThreatIntelligenceTaxiiDataConnector.json
      */
     /**
      * Sample code: Creates or updates a Threat Intelligence Taxii data connector.
@@ -1702,7 +1726,7 @@ public final class DataConnectorsCreateOrUpdateSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CreateThreatIntelligenceDataConnector.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CreateThreatIntelligenceDataConnector.json
      */
     /**
      * Sample code: Creates or updates an Threat Intelligence Platform data connector.
@@ -1727,7 +1751,7 @@ public final class DataConnectorsCreateOrUpdateSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CreateDynamics365DataConnetor.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CreateDynamics365DataConnetor.json
      */
     /**
      * Sample code: Creates or updates a Dynamics365 data connector.
@@ -1754,7 +1778,7 @@ public final class DataConnectorsCreateOrUpdateSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CreateGenericUI.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CreateGenericUI.json
      */
     /**
      * Sample code: Creates or updates a GenericUI data connector.
@@ -2074,7 +2098,7 @@ public final class DataConnectorsCreateOrUpdateSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CreateOffice365ProjectDataConnetor.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CreateOffice365ProjectDataConnetor.json
      */
     /**
      * Sample code: Creates or updates an Office365 Project data connector.
@@ -2099,7 +2123,7 @@ public final class DataConnectorsCreateOrUpdateSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CreateAPIPolling.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CreateAPIPolling.json
      */
     /**
      * Sample code: Creates or updates a APIPolling data connector.
@@ -2252,7 +2276,7 @@ import com.azure.core.util.Context;
 /** Samples for DataConnectors Delete. */
 public final class DataConnectorsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/DeleteOffice365ProjectDataConnetor.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/DeleteOffice365ProjectDataConnetor.json
      */
     /**
      * Sample code: Delete an Office365 Project data connector.
@@ -2267,7 +2291,7 @@ public final class DataConnectorsDeleteSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/DeleteGenericUI.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/DeleteGenericUI.json
      */
     /**
      * Sample code: Delete a GenericUI data connector.
@@ -2282,7 +2306,7 @@ public final class DataConnectorsDeleteSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/DeleteOfficeDataConnetor.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/DeleteOfficeDataConnetor.json
      */
     /**
      * Sample code: Delete an Office365 data connector.
@@ -2297,7 +2321,7 @@ public final class DataConnectorsDeleteSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/DeleteOfficePowerBIDataConnetor.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/DeleteOfficePowerBIDataConnetor.json
      */
     /**
      * Sample code: Delete an Office PowerBI data connector.
@@ -2312,7 +2336,7 @@ public final class DataConnectorsDeleteSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/DeleteAPIPolling.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/DeleteAPIPolling.json
      */
     /**
      * Sample code: Delete a APIPolling data connector.
@@ -2336,7 +2360,7 @@ import com.azure.core.util.Context;
 /** Samples for DataConnectors Disconnect. */
 public final class DataConnectorsDisconnectSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/DisconnectAPIPolling.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/DisconnectAPIPolling.json
      */
     /**
      * Sample code: Disconnect an APIPolling data connector.
@@ -2360,7 +2384,7 @@ import com.azure.core.util.Context;
 /** Samples for DataConnectors Get. */
 public final class DataConnectorsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetOffice365ProjectDataConnetorById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetOffice365ProjectDataConnetorById.json
      */
     /**
      * Sample code: Get an Office365 Project data connector.
@@ -2375,7 +2399,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetGenericUI.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetGenericUI.json
      */
     /**
      * Sample code: Get a GenericUI data connector.
@@ -2390,7 +2414,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetOffice365AdvancedThreatProtectionById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetOffice365AdvancedThreatProtectionById.json
      */
     /**
      * Sample code: Get an Office ATP data connector.
@@ -2405,7 +2429,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetIoTById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetIoTById.json
      */
     /**
      * Sample code: Get a IoT data connector.
@@ -2420,7 +2444,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetMicrosoftCloudAppSecurityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetMicrosoftCloudAppSecurityById.json
      */
     /**
      * Sample code: Get a MCAS data connector.
@@ -2435,7 +2459,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetThreatIntelligenceTaxiiById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetThreatIntelligenceTaxiiById.json
      */
     /**
      * Sample code: Get a TI Taxii data connector.
@@ -2450,7 +2474,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetMicrosoftThreatIntelligenceById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetMicrosoftThreatIntelligenceById.json
      */
     /**
      * Sample code: Get a MicrosoftThreatIntelligence data connector.
@@ -2465,7 +2489,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetAzureSecurityCenterById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetAzureSecurityCenterById.json
      */
     /**
      * Sample code: Get a ASC data connector.
@@ -2480,7 +2504,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetThreatIntelligenceById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetThreatIntelligenceById.json
      */
     /**
      * Sample code: Get a TI data connector.
@@ -2494,7 +2518,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetAmazonWebServicesCloudTrailById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetAmazonWebServicesCloudTrailById.json
      */
     /**
      * Sample code: Get an AwsCloudTrail data connector.
@@ -2509,7 +2533,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetMicrosoftDefenderAdvancedThreatProtectionById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetMicrosoftDefenderAdvancedThreatProtectionById.json
      */
     /**
      * Sample code: Get a MDATP data connector.
@@ -2524,7 +2548,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetMicrosoftThreatProtectionById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetMicrosoftThreatProtectionById.json
      */
     /**
      * Sample code: Get a MicrosoftThreatProtection data connector.
@@ -2539,7 +2563,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetAzureActiveDirectoryById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetAzureActiveDirectoryById.json
      */
     /**
      * Sample code: Get an AAD data connector.
@@ -2554,7 +2578,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetAzureAdvancedThreatProtectionById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetAzureAdvancedThreatProtectionById.json
      */
     /**
      * Sample code: Get an AATP data connector.
@@ -2569,7 +2593,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetAPIPolling.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetAPIPolling.json
      */
     /**
      * Sample code: Get a APIPolling data connector.
@@ -2584,7 +2608,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetMicrosoftInsiderRiskManagementById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetMicrosoftInsiderRiskManagementById.json
      */
     /**
      * Sample code: Get an Office IRM data connector.
@@ -2599,7 +2623,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetDynamics365DataConnectorById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetDynamics365DataConnectorById.json
      */
     /**
      * Sample code: Get a Dynamics365 data connector.
@@ -2614,7 +2638,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetOfficeDataConnetorById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetOfficeDataConnetorById.json
      */
     /**
      * Sample code: Get an Office365 data connector.
@@ -2629,7 +2653,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetAmazonWebServicesS3ById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetAmazonWebServicesS3ById.json
      */
     /**
      * Sample code: Get an Aws S3 data connector.
@@ -2644,7 +2668,7 @@ public final class DataConnectorsGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetOfficePowerBIDataConnetorById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetOfficePowerBIDataConnetorById.json
      */
     /**
      * Sample code: Get an Office365 PowerBI data connector.
@@ -2668,7 +2692,7 @@ import com.azure.core.util.Context;
 /** Samples for DataConnectors List. */
 public final class DataConnectorsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetDataConnectors.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetDataConnectors.json
      */
     /**
      * Sample code: Get all data connectors.
@@ -2703,7 +2727,7 @@ import com.azure.resourcemanager.securityinsights.models.TiTaxiiCheckRequirement
 /** Samples for DataConnectorsCheckRequirementsOperation Post. */
 public final class DataConnectorsCheckRequirementsOperationPostSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsOfficeATP.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsOfficeATP.json
      */
     /**
      * Sample code: Check requirements for OfficeATP.
@@ -2718,7 +2742,7 @@ public final class DataConnectorsCheckRequirementsOperationPostSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsOffice365Project.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsOffice365Project.json
      */
     /**
      * Sample code: Check requirements for Office365Project.
@@ -2733,7 +2757,7 @@ public final class DataConnectorsCheckRequirementsOperationPostSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json
      */
     /**
      * Sample code: Check requirements for AAD.
@@ -2748,7 +2772,7 @@ public final class DataConnectorsCheckRequirementsOperationPostSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json
      */
     /**
      * Sample code: Check requirements for Mcas.
@@ -2763,7 +2787,7 @@ public final class DataConnectorsCheckRequirementsOperationPostSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsIoT.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsIoT.json
      */
     /**
      * Sample code: Check requirements for IoT.
@@ -2782,7 +2806,7 @@ public final class DataConnectorsCheckRequirementsOperationPostSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json
      */
     /**
      * Sample code: Check requirements for Mdatp.
@@ -2797,7 +2821,7 @@ public final class DataConnectorsCheckRequirementsOperationPostSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json
      */
     /**
      * Sample code: Check requirements for AAD - no authorization.
@@ -2812,7 +2836,7 @@ public final class DataConnectorsCheckRequirementsOperationPostSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json
      */
     /**
      * Sample code: Check requirements for ASC.
@@ -2831,7 +2855,7 @@ public final class DataConnectorsCheckRequirementsOperationPostSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftThreatProtection.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftThreatProtection.json
      */
     /**
      * Sample code: Check requirements for MicrosoftThreatProtection.
@@ -2846,7 +2870,7 @@ public final class DataConnectorsCheckRequirementsOperationPostSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligenceTaxii.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligenceTaxii.json
      */
     /**
      * Sample code: Check requirements for TI Taxii.
@@ -2861,7 +2885,7 @@ public final class DataConnectorsCheckRequirementsOperationPostSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsOfficeIRM.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsOfficeIRM.json
      */
     /**
      * Sample code: Check requirements for OfficeIRM.
@@ -2876,7 +2900,7 @@ public final class DataConnectorsCheckRequirementsOperationPostSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftThreatIntelligence.json
      */
     /**
      * Sample code: Check requirements for MicrosoftThreatIntelligence.
@@ -2891,7 +2915,7 @@ public final class DataConnectorsCheckRequirementsOperationPostSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsOfficePowerBI.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsOfficePowerBI.json
      */
     /**
      * Sample code: Check requirements for OfficePowerBI.
@@ -2906,7 +2930,7 @@ public final class DataConnectorsCheckRequirementsOperationPostSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsDynamics365.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsDynamics365.json
      */
     /**
      * Sample code: Check requirements for Dynamics365.
@@ -2921,7 +2945,7 @@ public final class DataConnectorsCheckRequirementsOperationPostSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json
      */
     /**
      * Sample code: Check requirements for AAD - no license.
@@ -2936,7 +2960,7 @@ public final class DataConnectorsCheckRequirementsOperationPostSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json
      */
     /**
      * Sample code: Check requirements for TI.
@@ -2960,7 +2984,7 @@ import com.azure.core.util.Context;
 /** Samples for DomainWhois Get. */
 public final class DomainWhoisGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/enrichment/GetWhoisByDomainName.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/enrichment/GetWhoisByDomainName.json
      */
     /**
      * Sample code: Get whois information for a single domain name.
@@ -2985,7 +3009,7 @@ import java.util.UUID;
 /** Samples for Entities Expand. */
 public final class EntitiesExpandSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/expand/PostExpandEntity.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/expand/PostExpandEntity.json
      */
     /**
      * Sample code: Expand an entity.
@@ -3016,7 +3040,7 @@ import com.azure.core.util.Context;
 /** Samples for Entities Get. */
 public final class EntitiesGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetSubmissionMailEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetSubmissionMailEntityById.json
      */
     /**
      * Sample code: Get a submissionMail entity.
@@ -3029,7 +3053,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetDnsEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetDnsEntityById.json
      */
     /**
      * Sample code: Get a dns entity.
@@ -3041,7 +3065,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetFileHashEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetFileHashEntityById.json
      */
     /**
      * Sample code: Get a file hash entity.
@@ -3053,7 +3077,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetIoTDeviceEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetIoTDeviceEntityById.json
      */
     /**
      * Sample code: Get an IoT device entity.
@@ -3066,7 +3090,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetRegistryKeyEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetRegistryKeyEntityById.json
      */
     /**
      * Sample code: Get a registry key entity.
@@ -3079,7 +3103,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetMailboxEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetMailboxEntityById.json
      */
     /**
      * Sample code: Get a mailbox entity.
@@ -3091,7 +3115,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetMalwareEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetMalwareEntityById.json
      */
     /**
      * Sample code: Get a malware entity.
@@ -3103,7 +3127,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetSecurityAlertEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetSecurityAlertEntityById.json
      */
     /**
      * Sample code: Get a security alert entity.
@@ -3116,7 +3140,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetIpEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetIpEntityById.json
      */
     /**
      * Sample code: Get an ip entity.
@@ -3128,7 +3152,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetAccountEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetAccountEntityById.json
      */
     /**
      * Sample code: Get an account entity.
@@ -3140,7 +3164,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetCloudApplicationEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetCloudApplicationEntityById.json
      */
     /**
      * Sample code: Get a cloud application entity.
@@ -3153,7 +3177,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetFileEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetFileEntityById.json
      */
     /**
      * Sample code: Get a file entity.
@@ -3165,7 +3189,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetRegistryValueEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetRegistryValueEntityById.json
      */
     /**
      * Sample code: Get a registry value entity.
@@ -3178,7 +3202,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetUrlEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetUrlEntityById.json
      */
     /**
      * Sample code: Get a url entity.
@@ -3190,7 +3214,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetMailClusterEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetMailClusterEntityById.json
      */
     /**
      * Sample code: Get a mailCluster entity.
@@ -3203,7 +3227,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetSecurityGroupEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetSecurityGroupEntityById.json
      */
     /**
      * Sample code: Get a security group entity.
@@ -3216,7 +3240,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetMailMessageEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetMailMessageEntityById.json
      */
     /**
      * Sample code: Get a mailMessage entity.
@@ -3229,7 +3253,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetAzureResourceEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetAzureResourceEntityById.json
      */
     /**
      * Sample code: Get an azure resource entity.
@@ -3242,7 +3266,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetHostEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetHostEntityById.json
      */
     /**
      * Sample code: Get a host entity.
@@ -3254,7 +3278,7 @@ public final class EntitiesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetProcessEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetProcessEntityById.json
      */
     /**
      * Sample code: Get a process entity.
@@ -3279,7 +3303,7 @@ import java.util.UUID;
 /** Samples for Entities GetInsights. */
 public final class EntitiesGetInsightsSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/insights/PostGetInsights.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/insights/PostGetInsights.json
      */
     /**
      * Sample code: Entity Insight.
@@ -3311,7 +3335,7 @@ import com.azure.core.util.Context;
 /** Samples for Entities List. */
 public final class EntitiesListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetEntities.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetEntities.json
      */
     /**
      * Sample code: Get all entities.
@@ -3333,7 +3357,7 @@ import com.azure.resourcemanager.securityinsights.models.EntityItemQueryKind;
 /** Samples for Entities Queries. */
 public final class EntitiesQueriesSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetQueries.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetQueries.json
      */
     /**
      * Sample code: Get Entity Query.
@@ -3363,7 +3387,7 @@ import java.time.OffsetDateTime;
 /** Samples for EntitiesGetTimeline List. */
 public final class EntitiesGetTimelineListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/timeline/PostTimelineEntity.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/timeline/PostTimelineEntity.json
      */
     /**
      * Sample code: Entity timeline.
@@ -3394,7 +3418,7 @@ import com.azure.core.util.Context;
 /** Samples for EntitiesRelations List. */
 public final class EntitiesRelationsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/relations/GetAllEntityRelations.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/relations/GetAllEntityRelations.json
      */
     /**
      * Sample code: Get all relations of an entity.
@@ -3424,7 +3448,7 @@ import java.util.Map;
 /** Samples for EntityQueries CreateOrUpdate. */
 public final class EntityQueriesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entityQueries/CreateEntityQueryActivity.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entityQueries/CreateEntityQueryActivity.json
      */
     /**
      * Sample code: Creates or updates an Activity entity query.
@@ -3518,7 +3542,7 @@ import com.azure.core.util.Context;
 /** Samples for EntityQueries Delete. */
 public final class EntityQueriesDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entityQueries/DeleteEntityQuery.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entityQueries/DeleteEntityQuery.json
      */
     /**
      * Sample code: Delete an entity query.
@@ -3541,7 +3565,7 @@ import com.azure.core.util.Context;
 /** Samples for EntityQueries Get. */
 public final class EntityQueriesGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entityQueries/GetActivityEntityQueryById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entityQueries/GetActivityEntityQueryById.json
      */
     /**
      * Sample code: Get an Activity entity query.
@@ -3556,7 +3580,7 @@ public final class EntityQueriesGetSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entityQueries/GetExpansionEntityQueryById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entityQueries/GetExpansionEntityQueryById.json
      */
     /**
      * Sample code: Get an Expansion entity query.
@@ -3581,7 +3605,7 @@ import com.azure.resourcemanager.securityinsights.models.EntityQueriesKind;
 /** Samples for EntityQueries List. */
 public final class EntityQueriesListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entityQueries/GetEntityQueries.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entityQueries/GetEntityQueries.json
      */
     /**
      * Sample code: Get all entity queries.
@@ -3602,7 +3626,7 @@ import com.azure.core.util.Context;
 /** Samples for EntityQueryTemplates Get. */
 public final class EntityQueryTemplatesGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entityQueryTemplates/GetActivityEntityQueryTemplateById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entityQueryTemplates/GetActivityEntityQueryTemplateById.json
      */
     /**
      * Sample code: Get an Activity entity query template.
@@ -3622,12 +3646,12 @@ public final class EntityQueryTemplatesGetSamples {
 
 ```java
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.securityinsights.models.Constant88;
+import com.azure.resourcemanager.securityinsights.models.Constant90;
 
 /** Samples for EntityQueryTemplates List. */
 public final class EntityQueryTemplatesListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entityQueryTemplates/GetEntityQueryTemplates.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entityQueryTemplates/GetEntityQueryTemplates.json
      */
     /**
      * Sample code: Get all entity query templates.
@@ -3636,7 +3660,7 @@ public final class EntityQueryTemplatesListSamples {
      */
     public static void getAllEntityQueryTemplates(
         com.azure.resourcemanager.securityinsights.SecurityInsightsManager manager) {
-        manager.entityQueryTemplates().list("myRg", "myWorkspace", Constant88.ACTIVITY, Context.NONE);
+        manager.entityQueryTemplates().list("myRg", "myWorkspace", Constant90.ACTIVITY, Context.NONE);
     }
 }
 ```
@@ -3649,7 +3673,7 @@ import com.azure.core.util.Context;
 /** Samples for EntityRelations GetRelation. */
 public final class EntityRelationsGetRelationSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/relations/GetEntityRelationByName.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/relations/GetEntityRelationByName.json
      */
     /**
      * Sample code: Get an entity relation.
@@ -3680,7 +3704,7 @@ import com.azure.resourcemanager.securityinsights.models.IngestionMode;
 /** Samples for FileImports Create. */
 public final class FileImportsCreateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/fileImports/CreateFileImport.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/fileImports/CreateFileImport.json
      */
     /**
      * Sample code: Create a file import.
@@ -3710,7 +3734,7 @@ import com.azure.core.util.Context;
 /** Samples for FileImports Delete. */
 public final class FileImportsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/fileImports/DeleteFileImport.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/fileImports/DeleteFileImport.json
      */
     /**
      * Sample code: Delete a file import.
@@ -3731,7 +3755,7 @@ import com.azure.core.util.Context;
 /** Samples for FileImports Get. */
 public final class FileImportsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/fileImports/GetFileImportById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/fileImports/GetFileImportById.json
      */
     /**
      * Sample code: Get a file import.
@@ -3754,7 +3778,7 @@ import com.azure.core.util.Context;
 /** Samples for FileImports List. */
 public final class FileImportsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/fileImports/GetFileImports.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/fileImports/GetFileImports.json
      */
     /**
      * Sample code: Get all file imports.
@@ -3775,7 +3799,7 @@ public final class FileImportsListSamples {
 /** Samples for IncidentComments CreateOrUpdate. */
 public final class IncidentCommentsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/comments/CreateIncidentComment.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/comments/CreateIncidentComment.json
      */
     /**
      * Sample code: Creates or updates an incident comment.
@@ -3802,7 +3826,7 @@ import com.azure.core.util.Context;
 /** Samples for IncidentComments Delete. */
 public final class IncidentCommentsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/comments/DeleteIncidentComment.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/comments/DeleteIncidentComment.json
      */
     /**
      * Sample code: Delete the incident comment.
@@ -3831,7 +3855,7 @@ import com.azure.core.util.Context;
 /** Samples for IncidentComments Get. */
 public final class IncidentCommentsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/comments/GetIncidentCommentById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/comments/GetIncidentCommentById.json
      */
     /**
      * Sample code: Get an incident comment.
@@ -3860,7 +3884,7 @@ import com.azure.core.util.Context;
 /** Samples for IncidentComments List. */
 public final class IncidentCommentsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/comments/GetAllIncidentComments.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/comments/GetAllIncidentComments.json
      */
     /**
      * Sample code: Get all incident comments.
@@ -3885,7 +3909,7 @@ import com.azure.resourcemanager.securityinsights.fluent.models.RelationInner;
 /** Samples for IncidentRelations CreateOrUpdate. */
 public final class IncidentRelationsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/relations/CreateIncidentRelation.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/relations/CreateIncidentRelation.json
      */
     /**
      * Sample code: Creates or updates an incident relation.
@@ -3917,7 +3941,7 @@ import com.azure.core.util.Context;
 /** Samples for IncidentRelations Delete. */
 public final class IncidentRelationsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/relations/DeleteIncidentRelation.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/relations/DeleteIncidentRelation.json
      */
     /**
      * Sample code: Delete the incident relation.
@@ -3946,7 +3970,7 @@ import com.azure.core.util.Context;
 /** Samples for IncidentRelations Get. */
 public final class IncidentRelationsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/relations/GetIncidentRelationByName.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/relations/GetIncidentRelationByName.json
      */
     /**
      * Sample code: Get an incident relation.
@@ -3975,7 +3999,7 @@ import com.azure.core.util.Context;
 /** Samples for IncidentRelations List. */
 public final class IncidentRelationsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/relations/GetAllIncidentRelations.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/relations/GetAllIncidentRelations.json
      */
     /**
      * Sample code: Get all incident relations.
@@ -4005,7 +4029,7 @@ import java.util.UUID;
 /** Samples for Incidents CreateOrUpdate. */
 public final class IncidentsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/CreateIncident.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/CreateIncident.json
      */
     /**
      * Sample code: Creates or updates an incident.
@@ -4043,7 +4067,7 @@ import com.azure.resourcemanager.securityinsights.models.TeamProperties;
 /** Samples for Incidents CreateTeam. */
 public final class IncidentsCreateTeamSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/CreateTeam.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/CreateTeam.json
      */
     /**
      * Sample code: Creates incident teams group.
@@ -4072,7 +4096,7 @@ import com.azure.core.util.Context;
 /** Samples for Incidents Delete. */
 public final class IncidentsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/DeleteIncident.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/DeleteIncident.json
      */
     /**
      * Sample code: Delete an incident.
@@ -4095,7 +4119,7 @@ import com.azure.core.util.Context;
 /** Samples for Incidents Get. */
 public final class IncidentsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/GetIncidentById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/GetIncidentById.json
      */
     /**
      * Sample code: Get an incident.
@@ -4118,7 +4142,7 @@ import com.azure.core.util.Context;
 /** Samples for Incidents List. */
 public final class IncidentsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/GetIncidents.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/GetIncidents.json
      */
     /**
      * Sample code: Get all incidents.
@@ -4139,7 +4163,7 @@ import com.azure.core.util.Context;
 /** Samples for Incidents ListAlerts. */
 public final class IncidentsListAlertsSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/GetAllIncidentAlerts.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/GetAllIncidentAlerts.json
      */
     /**
      * Sample code: Get all incident alerts.
@@ -4163,7 +4187,7 @@ import com.azure.core.util.Context;
 /** Samples for Incidents ListBookmarks. */
 public final class IncidentsListBookmarksSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/GetAllIncidentBookmarks.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/GetAllIncidentBookmarks.json
      */
     /**
      * Sample code: Get all incident bookmarks.
@@ -4187,7 +4211,7 @@ import com.azure.core.util.Context;
 /** Samples for Incidents ListEntities. */
 public final class IncidentsListEntitiesSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/entities/GetAllIncidentEntities.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/entities/GetAllIncidentEntities.json
      */
     /**
      * Sample code: Gets all incident related entities.
@@ -4211,7 +4235,7 @@ import com.azure.core.util.Context;
 /** Samples for Incidents RunPlaybook. */
 public final class IncidentsRunPlaybookSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/manualTrigger/Incidents_RunPlaybook.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/manualTrigger/Incidents_RunPlaybook.json
      */
     /**
      * Sample code: Incidents_RunPlaybook.
@@ -4235,7 +4259,7 @@ import com.azure.core.util.Context;
 /** Samples for IpGeodata Get. */
 public final class IpGeodataGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/enrichment/GetGeodataByIp.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/enrichment/GetGeodataByIp.json
      */
     /**
      * Sample code: Get geodata for a single IP address.
@@ -4267,7 +4291,7 @@ import java.util.Arrays;
 /** Samples for Metadata Create. */
 public final class MetadataCreateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/metadata/PutMetadata.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/metadata/PutMetadata.json
      */
     /**
      * Sample code: Create/update full metadata.
@@ -4343,7 +4367,7 @@ public final class MetadataCreateSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/metadata/PutMetadataMinimal.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/metadata/PutMetadataMinimal.json
      */
     /**
      * Sample code: Create/update minimal metadata.
@@ -4373,7 +4397,7 @@ import com.azure.core.util.Context;
 /** Samples for Metadata Delete. */
 public final class MetadataDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/metadata/DeleteMetadata.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/metadata/DeleteMetadata.json
      */
     /**
      * Sample code: Delete metadata.
@@ -4394,7 +4418,7 @@ import com.azure.core.util.Context;
 /** Samples for Metadata Get. */
 public final class MetadataGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/metadata/GetMetadata.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/metadata/GetMetadata.json
      */
     /**
      * Sample code: Get single metadata by name.
@@ -4416,7 +4440,7 @@ import com.azure.core.util.Context;
 /** Samples for Metadata List. */
 public final class MetadataListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/metadata/GetAllMetadata.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/metadata/GetAllMetadata.json
      */
     /**
      * Sample code: Get all metadata.
@@ -4428,7 +4452,7 @@ public final class MetadataListSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/metadata/GetAllMetadataOData.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/metadata/GetAllMetadataOData.json
      */
     /**
      * Sample code: Get all metadata with OData filter/orderby/skip/top.
@@ -4452,7 +4476,7 @@ import com.azure.resourcemanager.securityinsights.models.MetadataModel;
 /** Samples for Metadata Update. */
 public final class MetadataUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/metadata/PatchMetadata.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/metadata/PatchMetadata.json
      */
     /**
      * Sample code: Update metadata.
@@ -4478,7 +4502,7 @@ import com.azure.core.util.Context;
 /** Samples for OfficeConsents Delete. */
 public final class OfficeConsentsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/officeConsents/DeleteOfficeConsents.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/officeConsents/DeleteOfficeConsents.json
      */
     /**
      * Sample code: Delete an office consent.
@@ -4502,7 +4526,7 @@ import com.azure.core.util.Context;
 /** Samples for OfficeConsents Get. */
 public final class OfficeConsentsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/officeConsents/GetOfficeConsentsById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/officeConsents/GetOfficeConsentsById.json
      */
     /**
      * Sample code: Get an office consent.
@@ -4525,7 +4549,7 @@ import com.azure.core.util.Context;
 /** Samples for OfficeConsents List. */
 public final class OfficeConsentsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/officeConsents/GetOfficeConsents.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/officeConsents/GetOfficeConsents.json
      */
     /**
      * Sample code: Get all office consents.
@@ -4547,7 +4571,7 @@ import com.azure.core.util.Context;
 /** Samples for Operations List. */
 public final class OperationsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/operations/ListOperations.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/operations/ListOperations.json
      */
     /**
      * Sample code: Get all operations.
@@ -4568,7 +4592,7 @@ import com.azure.core.util.Context;
 /** Samples for ProductSettings Delete. */
 public final class ProductSettingsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/settings/DeleteEyesOnSetting.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/settings/DeleteEyesOnSetting.json
      */
     /**
      * Sample code: Delete EyesOn settings.
@@ -4590,7 +4614,7 @@ import com.azure.core.util.Context;
 /** Samples for ProductSettings Get. */
 public final class ProductSettingsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/settings/GetEyesOnSetting.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/settings/GetEyesOnSetting.json
      */
     /**
      * Sample code: Get EyesOn settings.
@@ -4611,7 +4635,7 @@ import com.azure.core.util.Context;
 /** Samples for ProductSettings List. */
 public final class ProductSettingsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/settings/GetAllSettings.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/settings/GetAllSettings.json
      */
     /**
      * Sample code: Get all settings.
@@ -4633,7 +4657,7 @@ import com.azure.resourcemanager.securityinsights.models.EyesOn;
 /** Samples for ProductSettings Update. */
 public final class ProductSettingsUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/settings/UpdateEyesOnSetting.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/settings/UpdateEyesOnSetting.json
      */
     /**
      * Sample code: Update EyesOn settings.
@@ -4672,7 +4696,7 @@ import java.util.UUID;
 /** Samples for SecurityMLAnalyticsSettings CreateOrUpdate. */
 public final class SecurityMLAnalyticsSettingsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/securityMLAnalyticsSettings/CreateAnomalySecurityMLAnalyticsSetting.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/securityMLAnalyticsSettings/CreateAnomalySecurityMLAnalyticsSetting.json
      */
     /**
      * Sample code: Creates or updates a Anomaly Security ML Analytics Settings.
@@ -4739,7 +4763,7 @@ import com.azure.core.util.Context;
 /** Samples for SecurityMLAnalyticsSettings Delete. */
 public final class SecurityMLAnalyticsSettingsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/securityMLAnalyticsSettings/DeleteSecurityMLAnalyticsSetting.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/securityMLAnalyticsSettings/DeleteSecurityMLAnalyticsSetting.json
      */
     /**
      * Sample code: Delete a Security ML Analytics Settings.
@@ -4763,7 +4787,7 @@ import com.azure.core.util.Context;
 /** Samples for SecurityMLAnalyticsSettings Get. */
 public final class SecurityMLAnalyticsSettingsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/securityMLAnalyticsSettings/GetAnomalySecurityMLAnalyticsSetting.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/securityMLAnalyticsSettings/GetAnomalySecurityMLAnalyticsSetting.json
      */
     /**
      * Sample code: Get a Anomaly Security ML Analytics Settings.
@@ -4787,7 +4811,7 @@ import com.azure.core.util.Context;
 /** Samples for SecurityMLAnalyticsSettings List. */
 public final class SecurityMLAnalyticsSettingsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/securityMLAnalyticsSettings/GetAllSecurityMLAnalyticsSettings.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/securityMLAnalyticsSettings/GetAllSecurityMLAnalyticsSettings.json
      */
     /**
      * Sample code: Get all Security ML Analytics Settings.
@@ -4807,7 +4831,7 @@ public final class SecurityMLAnalyticsSettingsListSamples {
 /** Samples for SentinelOnboardingStates Create. */
 public final class SentinelOnboardingStatesCreateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/onboardingStates/CreateSentinelOnboardingState.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/onboardingStates/CreateSentinelOnboardingState.json
      */
     /**
      * Sample code: Create Sentinel onboarding state.
@@ -4834,7 +4858,7 @@ import com.azure.core.util.Context;
 /** Samples for SentinelOnboardingStates Delete. */
 public final class SentinelOnboardingStatesDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/onboardingStates/DeleteSentinelOnboardingState.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/onboardingStates/DeleteSentinelOnboardingState.json
      */
     /**
      * Sample code: Delete Sentinel onboarding state.
@@ -4856,7 +4880,7 @@ import com.azure.core.util.Context;
 /** Samples for SentinelOnboardingStates Get. */
 public final class SentinelOnboardingStatesGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/onboardingStates/GetSentinelOnboardingState.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/onboardingStates/GetSentinelOnboardingState.json
      */
     /**
      * Sample code: Get Sentinel onboarding state.
@@ -4878,7 +4902,7 @@ import com.azure.core.util.Context;
 /** Samples for SentinelOnboardingStates List. */
 public final class SentinelOnboardingStatesListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/onboardingStates/GetAllSentinelOnboardingStates.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/onboardingStates/GetAllSentinelOnboardingStates.json
      */
     /**
      * Sample code: Get all Sentinel onboarding states.
@@ -4901,7 +4925,7 @@ import com.azure.resourcemanager.securityinsights.models.RepoType;
 /** Samples for SourceControl ListRepositories. */
 public final class SourceControlListRepositoriesSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/repositories/GetRepositories.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/repositories/GetRepositories.json
      */
     /**
      * Sample code: Get repository list.
@@ -4926,7 +4950,7 @@ import java.util.Arrays;
 /** Samples for SourceControlsOperation Create. */
 public final class SourceControlsOperationCreateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/sourcecontrols/CreateSourceControl.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/sourcecontrols/CreateSourceControl.json
      */
     /**
      * Sample code: Creates a source control.
@@ -4971,7 +4995,7 @@ import com.azure.core.util.Context;
 /** Samples for SourceControlsOperation Delete. */
 public final class SourceControlsOperationDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/sourcecontrols/DeleteSourceControl.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/sourcecontrols/DeleteSourceControl.json
      */
     /**
      * Sample code: Delete a source control.
@@ -4995,7 +5019,7 @@ import com.azure.core.util.Context;
 /** Samples for SourceControlsOperation Get. */
 public final class SourceControlsOperationGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/sourcecontrols/GetSourceControlById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/sourcecontrols/GetSourceControlById.json
      */
     /**
      * Sample code: Get a source control.
@@ -5018,7 +5042,7 @@ import com.azure.core.util.Context;
 /** Samples for SourceControlsOperation List. */
 public final class SourceControlsOperationListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/sourcecontrols/GetSourceControls.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/sourcecontrols/GetSourceControls.json
      */
     /**
      * Sample code: Get all source controls.
@@ -5042,7 +5066,7 @@ import java.util.Arrays;
 /** Samples for ThreatIntelligenceIndicator AppendTags. */
 public final class ThreatIntelligenceIndicatorAppendTagsSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/AppendTagsThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/AppendTagsThreatIntelligence.json
      */
     /**
      * Sample code: Append tags to a threat intelligence indicator.
@@ -5073,7 +5097,7 @@ import java.util.Arrays;
 /** Samples for ThreatIntelligenceIndicator Create. */
 public final class ThreatIntelligenceIndicatorCreateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/UpdateThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/UpdateThreatIntelligence.json
      */
     /**
      * Sample code: Update a threat Intelligence indicator.
@@ -5121,7 +5145,7 @@ import java.util.Arrays;
 /** Samples for ThreatIntelligenceIndicator CreateIndicator. */
 public final class ThreatIntelligenceIndicatorCreateIndicatorSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/CreateThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/CreateThreatIntelligence.json
      */
     /**
      * Sample code: Create a new Threat Intelligence.
@@ -5166,7 +5190,7 @@ import com.azure.core.util.Context;
 /** Samples for ThreatIntelligenceIndicator Delete. */
 public final class ThreatIntelligenceIndicatorDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/DeleteThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/DeleteThreatIntelligence.json
      */
     /**
      * Sample code: Delete a threat intelligence indicator.
@@ -5190,7 +5214,7 @@ import com.azure.core.util.Context;
 /** Samples for ThreatIntelligenceIndicator Get. */
 public final class ThreatIntelligenceIndicatorGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/GetThreatIntelligenceById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/GetThreatIntelligenceById.json
      */
     /**
      * Sample code: View a threat intelligence indicator by name.
@@ -5218,7 +5242,7 @@ import java.util.Arrays;
 /** Samples for ThreatIntelligenceIndicator QueryIndicators. */
 public final class ThreatIntelligenceIndicatorQueryIndicatorsSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/QueryThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/QueryThreatIntelligence.json
      */
     /**
      * Sample code: Query threat intelligence indicators as per filtering criteria.
@@ -5260,7 +5284,7 @@ import java.util.Arrays;
 /** Samples for ThreatIntelligenceIndicator ReplaceTags. */
 public final class ThreatIntelligenceIndicatorReplaceTagsSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/ReplaceTagsThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/ReplaceTagsThreatIntelligence.json
      */
     /**
      * Sample code: Replace tags to a Threat Intelligence.
@@ -5291,7 +5315,7 @@ import com.azure.core.util.Context;
 /** Samples for ThreatIntelligenceIndicatorMetrics List. */
 public final class ThreatIntelligenceIndicatorMetricsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/CollectThreatIntelligenceMetrics.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/CollectThreatIntelligenceMetrics.json
      */
     /**
      * Sample code: Get threat intelligence indicators metrics.
@@ -5313,7 +5337,7 @@ import com.azure.core.util.Context;
 /** Samples for ThreatIntelligenceIndicatorsOperation List. */
 public final class ThreatIntelligenceIndicatorsOperationListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/GetThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/GetThreatIntelligence.json
      */
     /**
      * Sample code: Get all threat intelligence indicators.
@@ -5338,7 +5362,7 @@ import java.util.Map;
 /** Samples for WatchlistItems CreateOrUpdate. */
 public final class WatchlistItemsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/CreateWatchlistItem.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/CreateWatchlistItem.json
      */
     /**
      * Sample code: Creates or updates a watchlist item.
@@ -5390,7 +5414,7 @@ import com.azure.core.util.Context;
 /** Samples for WatchlistItems Delete. */
 public final class WatchlistItemsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/DeleteWatchlistItem.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/DeleteWatchlistItem.json
      */
     /**
      * Sample code: Delete a watchlist Item.
@@ -5415,7 +5439,7 @@ import com.azure.core.util.Context;
 /** Samples for WatchlistItems Get. */
 public final class WatchlistItemsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/GetWatchlistItemById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/GetWatchlistItemById.json
      */
     /**
      * Sample code: Get a watchlist item.
@@ -5439,7 +5463,7 @@ import com.azure.core.util.Context;
 /** Samples for WatchlistItems List. */
 public final class WatchlistItemsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/GetWatchlistItems.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/GetWatchlistItems.json
      */
     /**
      * Sample code: Get all watchlist Items.
@@ -5461,7 +5485,7 @@ import com.azure.resourcemanager.securityinsights.models.SourceType;
 /** Samples for Watchlists CreateOrUpdate. */
 public final class WatchlistsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/CreateWatchlistAndWatchlistItems.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/CreateWatchlistAndWatchlistItems.json
      */
     /**
      * Sample code: Creates or updates a watchlist and bulk creates watchlist items.
@@ -5488,7 +5512,7 @@ public final class WatchlistsCreateOrUpdateSamples {
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/CreateWatchlist.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/CreateWatchlist.json
      */
     /**
      * Sample code: Creates or updates a watchlist.
@@ -5521,7 +5545,7 @@ import com.azure.core.util.Context;
 /** Samples for Watchlists Delete. */
 public final class WatchlistsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/DeleteWatchlist.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/DeleteWatchlist.json
      */
     /**
      * Sample code: Delete a watchlist.
@@ -5542,7 +5566,7 @@ import com.azure.core.util.Context;
 /** Samples for Watchlists Get. */
 public final class WatchlistsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/GetWatchlistByAlias.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/GetWatchlistByAlias.json
      */
     /**
      * Sample code: Get a watchlist.
@@ -5563,7 +5587,7 @@ import com.azure.core.util.Context;
 /** Samples for Watchlists List. */
 public final class WatchlistsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/GetWatchlists.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/GetWatchlists.json
      */
     /**
      * Sample code: Get all watchlists.
@@ -5576,3 +5600,96 @@ public final class WatchlistsListSamples {
 }
 ```
 
+### WorkspaceManagerConfigurations_CreateOrUpdate
+
+```java
+import com.azure.resourcemanager.securityinsights.models.Mode;
+
+/** Samples for WorkspaceManagerConfigurations CreateOrUpdate. */
+public final class WorkspaceManagerConfigurationsCreateOrUpdateSamples {
+    /*
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/workspaceManagerConfigurations/CreateOrUpdateWorkspaceManagerConfiguration.json
+     */
+    /**
+     * Sample code: Create or Update a workspace manager Configuration.
+     *
+     * @param manager Entry point to SecurityInsightsManager.
+     */
+    public static void createOrUpdateAWorkspaceManagerConfiguration(
+        com.azure.resourcemanager.securityinsights.SecurityInsightsManager manager) {
+        manager
+            .workspaceManagerConfigurations()
+            .define("default")
+            .withExistingWorkspace("myRg", "myWorkspace")
+            .withMode(Mode.ENABLED)
+            .create();
+    }
+}
+```
+
+### WorkspaceManagerConfigurations_Delete
+
+```java
+import com.azure.core.util.Context;
+
+/** Samples for WorkspaceManagerConfigurations Delete. */
+public final class WorkspaceManagerConfigurationsDeleteSamples {
+    /*
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/workspaceManagerConfigurations/DeleteWorkspaceManagerConfiguration.json
+     */
+    /**
+     * Sample code: Delete a workspace manager configuration.
+     *
+     * @param manager Entry point to SecurityInsightsManager.
+     */
+    public static void deleteAWorkspaceManagerConfiguration(
+        com.azure.resourcemanager.securityinsights.SecurityInsightsManager manager) {
+        manager.workspaceManagerConfigurations().deleteWithResponse("myRg", "myWorkspace", "default", Context.NONE);
+    }
+}
+```
+
+### WorkspaceManagerConfigurations_Get
+
+```java
+import com.azure.core.util.Context;
+
+/** Samples for WorkspaceManagerConfigurations Get. */
+public final class WorkspaceManagerConfigurationsGetSamples {
+    /*
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/workspaceManagerConfigurations/GetWorkspaceManagerConfiguration.json
+     */
+    /**
+     * Sample code: Get a workspace manager configuration.
+     *
+     * @param manager Entry point to SecurityInsightsManager.
+     */
+    public static void getAWorkspaceManagerConfiguration(
+        com.azure.resourcemanager.securityinsights.SecurityInsightsManager manager) {
+        manager.workspaceManagerConfigurations().getWithResponse("myRg", "myWorkspace", "default", Context.NONE);
+    }
+}
+```
+
+### WorkspaceManagerConfigurations_List
+
+```java
+import com.azure.core.util.Context;
+
+/** Samples for WorkspaceManagerConfigurations List. */
+public final class WorkspaceManagerConfigurationsListSamples {
+    /*
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/workspaceManagerConfigurations/GetAllWorkspaceManagerConfigurations.json
+     */
+    /**
+     * Sample code: Get all workspace manager configurations for a Sentinel workspace.
+     *
+     * @param manager Entry point to SecurityInsightsManager.
+     */
+    public static void getAllWorkspaceManagerConfigurationsForASentinelWorkspace(
+        com.azure.resourcemanager.securityinsights.SecurityInsightsManager manager) {
+        manager.workspaceManagerConfigurations().list("myRg", "myWorkspace", null, null, null, Context.NONE);
+    }
+}
+```
+
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/pom.xml b/sdk/securityinsights/azure-resourcemanager-securityinsights/pom.xml
index 929945a8425f..f142a17c4ed6 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/pom.xml
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/pom.xml
@@ -13,7 +13,7 @@
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for SecurityInsights Management</name>
-  <description>This package contains Microsoft Azure SDK for SecurityInsights Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. API spec for Microsoft.SecurityInsights (Azure Security Insights) resource provider. Package tag package-preview-2022-09.</description>
+  <description>This package contains Microsoft Azure SDK for SecurityInsights Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. API spec for Microsoft.SecurityInsights (Azure Security Insights) resource provider. Package tag package-preview-2023-03.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <licenses>
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/SecurityInsightsManager.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/SecurityInsightsManager.java
index 6868ca4ea727..487b428d6a9e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/SecurityInsightsManager.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/SecurityInsightsManager.java
@@ -59,6 +59,7 @@
 import com.azure.resourcemanager.securityinsights.implementation.ThreatIntelligenceIndicatorsOperationsImpl;
 import com.azure.resourcemanager.securityinsights.implementation.WatchlistItemsImpl;
 import com.azure.resourcemanager.securityinsights.implementation.WatchlistsImpl;
+import com.azure.resourcemanager.securityinsights.implementation.WorkspaceManagerConfigurationsImpl;
 import com.azure.resourcemanager.securityinsights.models.Actions;
 import com.azure.resourcemanager.securityinsights.models.AlertRuleTemplates;
 import com.azure.resourcemanager.securityinsights.models.AlertRules;
@@ -93,6 +94,7 @@
 import com.azure.resourcemanager.securityinsights.models.ThreatIntelligenceIndicatorsOperations;
 import com.azure.resourcemanager.securityinsights.models.WatchlistItems;
 import com.azure.resourcemanager.securityinsights.models.Watchlists;
+import com.azure.resourcemanager.securityinsights.models.WorkspaceManagerConfigurations;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
@@ -167,6 +169,8 @@ public final class SecurityInsightsManager {
 
     private WatchlistItems watchlistItems;
 
+    private WorkspaceManagerConfigurations workspaceManagerConfigurations;
+
     private DataConnectors dataConnectors;
 
     private DataConnectorsCheckRequirementsOperations dataConnectorsCheckRequirementsOperations;
@@ -338,7 +342,7 @@ public SecurityInsightsManager authenticate(TokenCredential credential, AzurePro
                 .append("-")
                 .append("com.azure.resourcemanager.securityinsights")
                 .append("/")
-                .append("1.0.0-beta.4");
+                .append("1.0.0-beta.1");
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
                 userAgentBuilder
                     .append(" (")
@@ -774,6 +778,19 @@ public WatchlistItems watchlistItems() {
         return watchlistItems;
     }
 
+    /**
+     * Gets the resource collection API of WorkspaceManagerConfigurations. It manages WorkspaceManagerConfiguration.
+     *
+     * @return Resource collection API of WorkspaceManagerConfigurations.
+     */
+    public WorkspaceManagerConfigurations workspaceManagerConfigurations() {
+        if (this.workspaceManagerConfigurations == null) {
+            this.workspaceManagerConfigurations =
+                new WorkspaceManagerConfigurationsImpl(clientObject.getWorkspaceManagerConfigurations(), this);
+        }
+        return workspaceManagerConfigurations;
+    }
+
     /**
      * Gets the resource collection API of DataConnectors.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/ActionsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/ActionsClient.java
index 1679ca2138ad..18cfd50a2431 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/ActionsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/ActionsClient.java
@@ -44,21 +44,6 @@ public interface ActionsClient {
     PagedIterable<ActionResponseInner> listByAlertRule(
         String resourceGroupName, String workspaceName, String ruleId, Context context);
 
-    /**
-     * Gets the action of alert rule.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param ruleId Alert rule ID.
-     * @param actionId Action ID.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the action of alert rule.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    ActionResponseInner get(String resourceGroupName, String workspaceName, String ruleId, String actionId);
-
     /**
      * Gets the action of alert rule.
      *
@@ -77,21 +62,19 @@ Response<ActionResponseInner> getWithResponse(
         String resourceGroupName, String workspaceName, String ruleId, String actionId, Context context);
 
     /**
-     * Creates or updates the action of alert rule.
+     * Gets the action of alert rule.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
      * @param actionId Action ID.
-     * @param action The action.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return action for alert rule.
+     * @return the action of alert rule.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    ActionResponseInner createOrUpdate(
-        String resourceGroupName, String workspaceName, String ruleId, String actionId, ActionRequest action);
+    ActionResponseInner get(String resourceGroupName, String workspaceName, String ruleId, String actionId);
 
     /**
      * Creates or updates the action of alert rule.
@@ -117,18 +100,21 @@ Response<ActionResponseInner> createOrUpdateWithResponse(
         Context context);
 
     /**
-     * Delete the action of alert rule.
+     * Creates or updates the action of alert rule.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
      * @param actionId Action ID.
+     * @param action The action.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return action for alert rule.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String ruleId, String actionId);
+    ActionResponseInner createOrUpdate(
+        String resourceGroupName, String workspaceName, String ruleId, String actionId, ActionRequest action);
 
     /**
      * Delete the action of alert rule.
@@ -146,4 +132,18 @@ Response<ActionResponseInner> createOrUpdateWithResponse(
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<Void> deleteWithResponse(
         String resourceGroupName, String workspaceName, String ruleId, String actionId, Context context);
+
+    /**
+     * Delete the action of alert rule.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param ruleId Alert rule ID.
+     * @param actionId Action ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String workspaceName, String ruleId, String actionId);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/AlertRuleTemplatesClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/AlertRuleTemplatesClient.java
index c568ee0f23fe..1747732b0446 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/AlertRuleTemplatesClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/AlertRuleTemplatesClient.java
@@ -46,13 +46,15 @@ public interface AlertRuleTemplatesClient {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param alertRuleTemplateId Alert rule template ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the alert rule template.
+     * @return the alert rule template along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    AlertRuleTemplateInner get(String resourceGroupName, String workspaceName, String alertRuleTemplateId);
+    Response<AlertRuleTemplateInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String alertRuleTemplateId, Context context);
 
     /**
      * Gets the alert rule template.
@@ -60,13 +62,11 @@ public interface AlertRuleTemplatesClient {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param alertRuleTemplateId Alert rule template ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the alert rule template along with {@link Response}.
+     * @return the alert rule template.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<AlertRuleTemplateInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String alertRuleTemplateId, Context context);
+    AlertRuleTemplateInner get(String resourceGroupName, String workspaceName, String alertRuleTemplateId);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/AlertRulesClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/AlertRulesClient.java
index d40ca296e5fc..c77a3e9fa2fa 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/AlertRulesClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/AlertRulesClient.java
@@ -46,13 +46,15 @@ public interface AlertRulesClient {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the alert rule.
+     * @return the alert rule along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    AlertRuleInner get(String resourceGroupName, String workspaceName, String ruleId);
+    Response<AlertRuleInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String ruleId, Context context);
 
     /**
      * Gets the alert rule.
@@ -60,15 +62,13 @@ public interface AlertRulesClient {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the alert rule along with {@link Response}.
+     * @return the alert rule.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<AlertRuleInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String ruleId, Context context);
+    AlertRuleInner get(String resourceGroupName, String workspaceName, String ruleId);
 
     /**
      * Creates or updates the alert rule.
@@ -77,14 +77,15 @@ Response<AlertRuleInner> getWithResponse(
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
      * @param alertRule The alert rule.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return alert rule.
+     * @return alert rule along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    AlertRuleInner createOrUpdate(
-        String resourceGroupName, String workspaceName, String ruleId, AlertRuleInner alertRule);
+    Response<AlertRuleInner> createOrUpdateWithResponse(
+        String resourceGroupName, String workspaceName, String ruleId, AlertRuleInner alertRule, Context context);
 
     /**
      * Creates or updates the alert rule.
@@ -93,15 +94,14 @@ AlertRuleInner createOrUpdate(
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
      * @param alertRule The alert rule.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return alert rule along with {@link Response}.
+     * @return alert rule.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<AlertRuleInner> createOrUpdateWithResponse(
-        String resourceGroupName, String workspaceName, String ruleId, AlertRuleInner alertRule, Context context);
+    AlertRuleInner createOrUpdate(
+        String resourceGroupName, String workspaceName, String ruleId, AlertRuleInner alertRule);
 
     /**
      * Delete the alert rule.
@@ -109,12 +109,14 @@ Response<AlertRuleInner> createOrUpdateWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String ruleId);
+    Response<Void> deleteWithResponse(String resourceGroupName, String workspaceName, String ruleId, Context context);
 
     /**
      * Delete the alert rule.
@@ -122,12 +124,10 @@ Response<AlertRuleInner> createOrUpdateWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<Void> deleteWithResponse(String resourceGroupName, String workspaceName, String ruleId, Context context);
+    void delete(String resourceGroupName, String workspaceName, String ruleId);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/AutomationRulesClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/AutomationRulesClient.java
index 8bdfc546a32d..1e448c15a203 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/AutomationRulesClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/AutomationRulesClient.java
@@ -13,20 +13,6 @@
 
 /** An instance of this class provides access to all the operations defined in AutomationRulesClient. */
 public interface AutomationRulesClient {
-    /**
-     * Gets the automation rule.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param automationRuleId Automation rule ID.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the automation rule.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    AutomationRuleInner get(String resourceGroupName, String workspaceName, String automationRuleId);
-
     /**
      * Gets the automation rule.
      *
@@ -44,7 +30,7 @@ Response<AutomationRuleInner> getWithResponse(
         String resourceGroupName, String workspaceName, String automationRuleId, Context context);
 
     /**
-     * Creates or updates the automation rule.
+     * Gets the automation rule.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
@@ -52,10 +38,10 @@ Response<AutomationRuleInner> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response.
+     * @return the automation rule.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    AutomationRuleInner createOrUpdate(String resourceGroupName, String workspaceName, String automationRuleId);
+    AutomationRuleInner get(String resourceGroupName, String workspaceName, String automationRuleId);
 
     /**
      * Creates or updates the automation rule.
@@ -79,7 +65,7 @@ Response<AutomationRuleInner> createOrUpdateWithResponse(
         Context context);
 
     /**
-     * Delete the automation rule.
+     * Creates or updates the automation rule.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
@@ -87,10 +73,10 @@ Response<AutomationRuleInner> createOrUpdateWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return any object.
+     * @return the response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Object delete(String resourceGroupName, String workspaceName, String automationRuleId);
+    AutomationRuleInner createOrUpdate(String resourceGroupName, String workspaceName, String automationRuleId);
 
     /**
      * Delete the automation rule.
@@ -108,6 +94,20 @@ Response<AutomationRuleInner> createOrUpdateWithResponse(
     Response<Object> deleteWithResponse(
         String resourceGroupName, String workspaceName, String automationRuleId, Context context);
 
+    /**
+     * Delete the automation rule.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param automationRuleId Automation rule ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return any object.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Object delete(String resourceGroupName, String workspaceName, String automationRuleId);
+
     /**
      * Gets all automation rules.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/BookmarkOperationsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/BookmarkOperationsClient.java
index 1d63a4251db1..036b2b83f436 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/BookmarkOperationsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/BookmarkOperationsClient.java
@@ -20,14 +20,19 @@ public interface BookmarkOperationsClient {
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param parameters The parameters required to execute an expand operation on the given bookmark.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the entity expansion result operation response.
+     * @return the entity expansion result operation response along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    BookmarkExpandResponseInner expand(
-        String resourceGroupName, String workspaceName, String bookmarkId, BookmarkExpandParameters parameters);
+    Response<BookmarkExpandResponseInner> expandWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String bookmarkId,
+        BookmarkExpandParameters parameters,
+        Context context);
 
     /**
      * Expand an bookmark.
@@ -36,17 +41,12 @@ BookmarkExpandResponseInner expand(
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param parameters The parameters required to execute an expand operation on the given bookmark.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the entity expansion result operation response along with {@link Response}.
+     * @return the entity expansion result operation response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<BookmarkExpandResponseInner> expandWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String bookmarkId,
-        BookmarkExpandParameters parameters,
-        Context context);
+    BookmarkExpandResponseInner expand(
+        String resourceGroupName, String workspaceName, String bookmarkId, BookmarkExpandParameters parameters);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/BookmarkRelationsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/BookmarkRelationsClient.java
index e644d527b90a..0b823c7fb706 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/BookmarkRelationsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/BookmarkRelationsClient.java
@@ -56,21 +56,6 @@ PagedIterable<RelationInner> list(
         String skipToken,
         Context context);
 
-    /**
-     * Gets a bookmark relation.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param bookmarkId Bookmark ID.
-     * @param relationName Relation Name.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a bookmark relation.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    RelationInner get(String resourceGroupName, String workspaceName, String bookmarkId, String relationName);
-
     /**
      * Gets a bookmark relation.
      *
@@ -89,21 +74,19 @@ Response<RelationInner> getWithResponse(
         String resourceGroupName, String workspaceName, String bookmarkId, String relationName, Context context);
 
     /**
-     * Creates the bookmark relation.
+     * Gets a bookmark relation.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param relationName Relation Name.
-     * @param relation The relation model.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a relation between two resources.
+     * @return a bookmark relation.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    RelationInner createOrUpdate(
-        String resourceGroupName, String workspaceName, String bookmarkId, String relationName, RelationInner relation);
+    RelationInner get(String resourceGroupName, String workspaceName, String bookmarkId, String relationName);
 
     /**
      * Creates the bookmark relation.
@@ -129,18 +112,21 @@ Response<RelationInner> createOrUpdateWithResponse(
         Context context);
 
     /**
-     * Delete the bookmark relation.
+     * Creates the bookmark relation.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param relationName Relation Name.
+     * @param relation The relation model.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return represents a relation between two resources.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String bookmarkId, String relationName);
+    RelationInner createOrUpdate(
+        String resourceGroupName, String workspaceName, String bookmarkId, String relationName, RelationInner relation);
 
     /**
      * Delete the bookmark relation.
@@ -158,4 +144,18 @@ Response<RelationInner> createOrUpdateWithResponse(
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<Void> deleteWithResponse(
         String resourceGroupName, String workspaceName, String bookmarkId, String relationName, Context context);
+
+    /**
+     * Delete the bookmark relation.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param bookmarkId Bookmark ID.
+     * @param relationName Relation Name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String workspaceName, String bookmarkId, String relationName);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/BookmarksClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/BookmarksClient.java
index 767fec60845b..0e9d306ada84 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/BookmarksClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/BookmarksClient.java
@@ -46,13 +46,15 @@ public interface BookmarksClient {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a bookmark.
+     * @return a bookmark along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    BookmarkInner get(String resourceGroupName, String workspaceName, String bookmarkId);
+    Response<BookmarkInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String bookmarkId, Context context);
 
     /**
      * Gets a bookmark.
@@ -60,15 +62,13 @@ public interface BookmarksClient {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a bookmark along with {@link Response}.
+     * @return a bookmark.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<BookmarkInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String bookmarkId, Context context);
+    BookmarkInner get(String resourceGroupName, String workspaceName, String bookmarkId);
 
     /**
      * Creates or updates the bookmark.
@@ -77,14 +77,15 @@ Response<BookmarkInner> getWithResponse(
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param bookmark The bookmark.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a bookmark in Azure Security Insights.
+     * @return represents a bookmark in Azure Security Insights along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    BookmarkInner createOrUpdate(
-        String resourceGroupName, String workspaceName, String bookmarkId, BookmarkInner bookmark);
+    Response<BookmarkInner> createOrUpdateWithResponse(
+        String resourceGroupName, String workspaceName, String bookmarkId, BookmarkInner bookmark, Context context);
 
     /**
      * Creates or updates the bookmark.
@@ -93,15 +94,14 @@ BookmarkInner createOrUpdate(
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param bookmark The bookmark.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a bookmark in Azure Security Insights along with {@link Response}.
+     * @return represents a bookmark in Azure Security Insights.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<BookmarkInner> createOrUpdateWithResponse(
-        String resourceGroupName, String workspaceName, String bookmarkId, BookmarkInner bookmark, Context context);
+    BookmarkInner createOrUpdate(
+        String resourceGroupName, String workspaceName, String bookmarkId, BookmarkInner bookmark);
 
     /**
      * Delete the bookmark.
@@ -109,12 +109,15 @@ Response<BookmarkInner> createOrUpdateWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String bookmarkId);
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String bookmarkId, Context context);
 
     /**
      * Delete the bookmark.
@@ -122,13 +125,10 @@ Response<BookmarkInner> createOrUpdateWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String bookmarkId, Context context);
+    void delete(String resourceGroupName, String workspaceName, String bookmarkId);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/DataConnectorsCheckRequirementsOperationsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/DataConnectorsCheckRequirementsOperationsClient.java
index 146c3f4c1793..55a1fe985fac 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/DataConnectorsCheckRequirementsOperationsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/DataConnectorsCheckRequirementsOperationsClient.java
@@ -22,16 +22,18 @@ public interface DataConnectorsCheckRequirementsOperationsClient {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorsCheckRequirements The parameters for requirements check message.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return requirements state for a data connector type.
+     * @return requirements state for a data connector type along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    DataConnectorRequirementsStateInner post(
+    Response<DataConnectorRequirementsStateInner> postWithResponse(
         String resourceGroupName,
         String workspaceName,
-        DataConnectorsCheckRequirements dataConnectorsCheckRequirements);
+        DataConnectorsCheckRequirements dataConnectorsCheckRequirements,
+        Context context);
 
     /**
      * Get requirements state for a data connector type.
@@ -39,16 +41,14 @@ DataConnectorRequirementsStateInner post(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorsCheckRequirements The parameters for requirements check message.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return requirements state for a data connector type along with {@link Response}.
+     * @return requirements state for a data connector type.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<DataConnectorRequirementsStateInner> postWithResponse(
+    DataConnectorRequirementsStateInner post(
         String resourceGroupName,
         String workspaceName,
-        DataConnectorsCheckRequirements dataConnectorsCheckRequirements,
-        Context context);
+        DataConnectorsCheckRequirements dataConnectorsCheckRequirements);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/DataConnectorsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/DataConnectorsClient.java
index 78d1cc36c200..4763778493a5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/DataConnectorsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/DataConnectorsClient.java
@@ -41,20 +41,6 @@ public interface DataConnectorsClient {
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<DataConnectorInner> list(String resourceGroupName, String workspaceName, Context context);
 
-    /**
-     * Gets a data connector.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param dataConnectorId Connector ID.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a data connector.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    DataConnectorInner get(String resourceGroupName, String workspaceName, String dataConnectorId);
-
     /**
      * Gets a data connector.
      *
@@ -72,20 +58,18 @@ Response<DataConnectorInner> getWithResponse(
         String resourceGroupName, String workspaceName, String dataConnectorId, Context context);
 
     /**
-     * Creates or updates the data connector.
+     * Gets a data connector.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
-     * @param dataConnector The data connector.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return data connector.
+     * @return a data connector.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    DataConnectorInner createOrUpdate(
-        String resourceGroupName, String workspaceName, String dataConnectorId, DataConnectorInner dataConnector);
+    DataConnectorInner get(String resourceGroupName, String workspaceName, String dataConnectorId);
 
     /**
      * Creates or updates the data connector.
@@ -109,17 +93,20 @@ Response<DataConnectorInner> createOrUpdateWithResponse(
         Context context);
 
     /**
-     * Delete the data connector.
+     * Creates or updates the data connector.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
+     * @param dataConnector The data connector.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return data connector.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String dataConnectorId);
+    DataConnectorInner createOrUpdate(
+        String resourceGroupName, String workspaceName, String dataConnectorId, DataConnectorInner dataConnector);
 
     /**
      * Delete the data connector.
@@ -138,19 +125,17 @@ Response<Void> deleteWithResponse(
         String resourceGroupName, String workspaceName, String dataConnectorId, Context context);
 
     /**
-     * Connects a data connector.
+     * Delete the data connector.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
-     * @param connectBody The data connector.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void connect(
-        String resourceGroupName, String workspaceName, String dataConnectorId, DataConnectorConnectBody connectBody);
+    void delete(String resourceGroupName, String workspaceName, String dataConnectorId);
 
     /**
      * Connects a data connector.
@@ -174,17 +159,19 @@ Response<Void> connectWithResponse(
         Context context);
 
     /**
-     * Disconnect a data connector.
+     * Connects a data connector.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
+     * @param connectBody The data connector.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void disconnect(String resourceGroupName, String workspaceName, String dataConnectorId);
+    void connect(
+        String resourceGroupName, String workspaceName, String dataConnectorId, DataConnectorConnectBody connectBody);
 
     /**
      * Disconnect a data connector.
@@ -201,4 +188,17 @@ Response<Void> connectWithResponse(
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<Void> disconnectWithResponse(
         String resourceGroupName, String workspaceName, String dataConnectorId, Context context);
+
+    /**
+     * Disconnect a data connector.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param dataConnectorId Connector ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void disconnect(String resourceGroupName, String workspaceName, String dataConnectorId);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/DomainWhoisClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/DomainWhoisClient.java
index e9ae9d9fcfed..250fe4b189d4 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/DomainWhoisClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/DomainWhoisClient.java
@@ -17,25 +17,25 @@ public interface DomainWhoisClient {
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param domain Domain name to be enriched.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return whois information for a single domain name.
+     * @return whois information for a single domain name along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    EnrichmentDomainWhoisInner get(String resourceGroupName, String domain);
+    Response<EnrichmentDomainWhoisInner> getWithResponse(String resourceGroupName, String domain, Context context);
 
     /**
      * Get whois information for a single domain name.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param domain Domain name to be enriched.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return whois information for a single domain name along with {@link Response}.
+     * @return whois information for a single domain name.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<EnrichmentDomainWhoisInner> getWithResponse(String resourceGroupName, String domain, Context context);
+    EnrichmentDomainWhoisInner get(String resourceGroupName, String domain);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntitiesClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntitiesClient.java
index 28404013fdcb..8094b91298f6 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntitiesClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntitiesClient.java
@@ -46,20 +46,6 @@ public interface EntitiesClient {
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<EntityInner> list(String resourceGroupName, String workspaceName, Context context);
 
-    /**
-     * Gets an entity.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param entityId entity ID.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    EntityInner get(String resourceGroupName, String workspaceName, String entityId);
-
     /**
      * Gets an entity.
      *
@@ -77,20 +63,18 @@ Response<EntityInner> getWithResponse(
         String resourceGroupName, String workspaceName, String entityId, Context context);
 
     /**
-     * Expands an entity.
+     * Gets an entity.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
-     * @param parameters The parameters required to execute an expand operation on the given entity.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the entity expansion result operation response.
+     * @return an entity.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    EntityExpandResponseInner expand(
-        String resourceGroupName, String workspaceName, String entityId, EntityExpandParameters parameters);
+    EntityInner get(String resourceGroupName, String workspaceName, String entityId);
 
     /**
      * Expands an entity.
@@ -114,20 +98,20 @@ Response<EntityExpandResponseInner> expandWithResponse(
         Context context);
 
     /**
-     * Get Insights and Activities for an entity.
+     * Expands an entity.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
-     * @param kind The Kind parameter for queries.
+     * @param parameters The parameters required to execute an expand operation on the given entity.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return insights and Activities for an entity.
+     * @return the entity expansion result operation response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    GetQueriesResponseInner queries(
-        String resourceGroupName, String workspaceName, String entityId, EntityItemQueryKind kind);
+    EntityExpandResponseInner expand(
+        String resourceGroupName, String workspaceName, String entityId, EntityExpandParameters parameters);
 
     /**
      * Get Insights and Activities for an entity.
@@ -147,20 +131,20 @@ Response<GetQueriesResponseInner> queriesWithResponse(
         String resourceGroupName, String workspaceName, String entityId, EntityItemQueryKind kind, Context context);
 
     /**
-     * Execute Insights for an entity.
+     * Get Insights and Activities for an entity.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
-     * @param parameters The parameters required to execute insights on the given entity.
+     * @param kind The Kind parameter for queries.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Get Insights result operation response.
+     * @return insights and Activities for an entity.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    EntityGetInsightsResponseInner getInsights(
-        String resourceGroupName, String workspaceName, String entityId, EntityGetInsightsParameters parameters);
+    GetQueriesResponseInner queries(
+        String resourceGroupName, String workspaceName, String entityId, EntityItemQueryKind kind);
 
     /**
      * Execute Insights for an entity.
@@ -182,4 +166,20 @@ Response<EntityGetInsightsResponseInner> getInsightsWithResponse(
         String entityId,
         EntityGetInsightsParameters parameters,
         Context context);
+
+    /**
+     * Execute Insights for an entity.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param entityId entity ID.
+     * @param parameters The parameters required to execute insights on the given entity.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the Get Insights result operation response.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    EntityGetInsightsResponseInner getInsights(
+        String resourceGroupName, String workspaceName, String entityId, EntityGetInsightsParameters parameters);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntitiesGetTimelinesClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntitiesGetTimelinesClient.java
index bfa335c3065e..e5cb96dad521 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntitiesGetTimelinesClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntitiesGetTimelinesClient.java
@@ -20,14 +20,19 @@ public interface EntitiesGetTimelinesClient {
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param parameters The parameters required to execute an timeline operation on the given entity.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the entity timeline result operation response.
+     * @return the entity timeline result operation response along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    EntityTimelineResponseInner list(
-        String resourceGroupName, String workspaceName, String entityId, EntityTimelineParameters parameters);
+    Response<EntityTimelineResponseInner> listWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String entityId,
+        EntityTimelineParameters parameters,
+        Context context);
 
     /**
      * Timeline for an entity.
@@ -36,17 +41,12 @@ EntityTimelineResponseInner list(
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param parameters The parameters required to execute an timeline operation on the given entity.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the entity timeline result operation response along with {@link Response}.
+     * @return the entity timeline result operation response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<EntityTimelineResponseInner> listWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String entityId,
-        EntityTimelineParameters parameters,
-        Context context);
+    EntityTimelineResponseInner list(
+        String resourceGroupName, String workspaceName, String entityId, EntityTimelineParameters parameters);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntityQueriesClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntityQueriesClient.java
index 68ba3c6be0c3..82117433e188 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntityQueriesClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntityQueriesClient.java
@@ -44,20 +44,6 @@ public interface EntityQueriesClient {
     PagedIterable<EntityQueryInner> list(
         String resourceGroupName, String workspaceName, EntityQueriesKind kind, Context context);
 
-    /**
-     * Gets an entity query.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param entityQueryId entity query ID.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity query.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    EntityQueryInner get(String resourceGroupName, String workspaceName, String entityQueryId);
-
     /**
      * Gets an entity query.
      *
@@ -75,20 +61,18 @@ Response<EntityQueryInner> getWithResponse(
         String resourceGroupName, String workspaceName, String entityQueryId, Context context);
 
     /**
-     * Creates or updates the entity query.
+     * Gets an entity query.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityQueryId entity query ID.
-     * @param entityQuery The entity query we want to create or update.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return specific entity query.
+     * @return an entity query.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    EntityQueryInner createOrUpdate(
-        String resourceGroupName, String workspaceName, String entityQueryId, CustomEntityQuery entityQuery);
+    EntityQueryInner get(String resourceGroupName, String workspaceName, String entityQueryId);
 
     /**
      * Creates or updates the entity query.
@@ -112,17 +96,20 @@ Response<EntityQueryInner> createOrUpdateWithResponse(
         Context context);
 
     /**
-     * Delete the entity query.
+     * Creates or updates the entity query.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityQueryId entity query ID.
+     * @param entityQuery The entity query we want to create or update.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return specific entity query.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String entityQueryId);
+    EntityQueryInner createOrUpdate(
+        String resourceGroupName, String workspaceName, String entityQueryId, CustomEntityQuery entityQuery);
 
     /**
      * Delete the entity query.
@@ -139,4 +126,17 @@ Response<EntityQueryInner> createOrUpdateWithResponse(
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<Void> deleteWithResponse(
         String resourceGroupName, String workspaceName, String entityQueryId, Context context);
+
+    /**
+     * Delete the entity query.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param entityQueryId entity query ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String workspaceName, String entityQueryId);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntityQueryTemplatesClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntityQueryTemplatesClient.java
index 96c60a276dae..5e80bc5b9f63 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntityQueryTemplatesClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntityQueryTemplatesClient.java
@@ -10,7 +10,7 @@
 import com.azure.core.http.rest.Response;
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityQueryTemplateInner;
-import com.azure.resourcemanager.securityinsights.models.Constant88;
+import com.azure.resourcemanager.securityinsights.models.Constant90;
 
 /** An instance of this class provides access to all the operations defined in EntityQueryTemplatesClient. */
 public interface EntityQueryTemplatesClient {
@@ -41,7 +41,7 @@ public interface EntityQueryTemplatesClient {
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<EntityQueryTemplateInner> list(
-        String resourceGroupName, String workspaceName, Constant88 kind, Context context);
+        String resourceGroupName, String workspaceName, Constant90 kind, Context context);
 
     /**
      * Gets an entity query.
@@ -49,13 +49,15 @@ PagedIterable<EntityQueryTemplateInner> list(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityQueryTemplateId entity query template ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity query.
+     * @return an entity query along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    EntityQueryTemplateInner get(String resourceGroupName, String workspaceName, String entityQueryTemplateId);
+    Response<EntityQueryTemplateInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String entityQueryTemplateId, Context context);
 
     /**
      * Gets an entity query.
@@ -63,13 +65,11 @@ PagedIterable<EntityQueryTemplateInner> list(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityQueryTemplateId entity query template ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity query along with {@link Response}.
+     * @return an entity query.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<EntityQueryTemplateInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String entityQueryTemplateId, Context context);
+    EntityQueryTemplateInner get(String resourceGroupName, String workspaceName, String entityQueryTemplateId);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntityRelationsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntityRelationsClient.java
index 9f6c0165269d..3e639cbd1f19 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntityRelationsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/EntityRelationsClient.java
@@ -19,13 +19,15 @@ public interface EntityRelationsClient {
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param relationName Relation Name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity relation.
+     * @return an entity relation along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    RelationInner getRelation(String resourceGroupName, String workspaceName, String entityId, String relationName);
+    Response<RelationInner> getRelationWithResponse(
+        String resourceGroupName, String workspaceName, String entityId, String relationName, Context context);
 
     /**
      * Gets an entity relation.
@@ -34,13 +36,11 @@ public interface EntityRelationsClient {
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param relationName Relation Name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity relation along with {@link Response}.
+     * @return an entity relation.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<RelationInner> getRelationWithResponse(
-        String resourceGroupName, String workspaceName, String entityId, String relationName, Context context);
+    RelationInner getRelation(String resourceGroupName, String workspaceName, String entityId, String relationName);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/FileImportsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/FileImportsClient.java
index 91450d050bde..78fe1246fb25 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/FileImportsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/FileImportsClient.java
@@ -61,13 +61,15 @@ PagedIterable<FileImportInner> list(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param fileImportId File import ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a file import.
+     * @return a file import along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    FileImportInner get(String resourceGroupName, String workspaceName, String fileImportId);
+    Response<FileImportInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String fileImportId, Context context);
 
     /**
      * Gets a file import.
@@ -75,15 +77,13 @@ PagedIterable<FileImportInner> list(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param fileImportId File import ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a file import along with {@link Response}.
+     * @return a file import.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<FileImportInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String fileImportId, Context context);
+    FileImportInner get(String resourceGroupName, String workspaceName, String fileImportId);
 
     /**
      * Creates the file import.
@@ -92,14 +92,19 @@ Response<FileImportInner> getWithResponse(
      * @param workspaceName The name of the workspace.
      * @param fileImportId File import ID.
      * @param fileImport The file import.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a file import in Azure Security Insights.
+     * @return represents a file import in Azure Security Insights along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    FileImportInner create(
-        String resourceGroupName, String workspaceName, String fileImportId, FileImportInner fileImport);
+    Response<FileImportInner> createWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String fileImportId,
+        FileImportInner fileImport,
+        Context context);
 
     /**
      * Creates the file import.
@@ -108,19 +113,14 @@ FileImportInner create(
      * @param workspaceName The name of the workspace.
      * @param fileImportId File import ID.
      * @param fileImport The file import.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a file import in Azure Security Insights along with {@link Response}.
+     * @return represents a file import in Azure Security Insights.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<FileImportInner> createWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String fileImportId,
-        FileImportInner fileImport,
-        Context context);
+    FileImportInner create(
+        String resourceGroupName, String workspaceName, String fileImportId, FileImportInner fileImport);
 
     /**
      * Delete the file import.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/IncidentCommentsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/IncidentCommentsClient.java
index c8f34adc3578..6d88b1dfaa7b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/IncidentCommentsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/IncidentCommentsClient.java
@@ -63,14 +63,15 @@ PagedIterable<IncidentCommentInner> list(
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param incidentCommentId Incident comment ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an incident comment.
+     * @return an incident comment along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    IncidentCommentInner get(
-        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId);
+    Response<IncidentCommentInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId, Context context);
 
     /**
      * Gets an incident comment.
@@ -79,15 +80,14 @@ IncidentCommentInner get(
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param incidentCommentId Incident comment ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an incident comment along with {@link Response}.
+     * @return an incident comment.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<IncidentCommentInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId, Context context);
+    IncidentCommentInner get(
+        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId);
 
     /**
      * Creates or updates the incident comment.
@@ -97,18 +97,20 @@ Response<IncidentCommentInner> getWithResponse(
      * @param incidentId Incident ID.
      * @param incidentCommentId Incident comment ID.
      * @param incidentComment The incident comment.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents an incident comment.
+     * @return represents an incident comment along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    IncidentCommentInner createOrUpdate(
+    Response<IncidentCommentInner> createOrUpdateWithResponse(
         String resourceGroupName,
         String workspaceName,
         String incidentId,
         String incidentCommentId,
-        IncidentCommentInner incidentComment);
+        IncidentCommentInner incidentComment,
+        Context context);
 
     /**
      * Creates or updates the incident comment.
@@ -118,20 +120,18 @@ IncidentCommentInner createOrUpdate(
      * @param incidentId Incident ID.
      * @param incidentCommentId Incident comment ID.
      * @param incidentComment The incident comment.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents an incident comment along with {@link Response}.
+     * @return represents an incident comment.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<IncidentCommentInner> createOrUpdateWithResponse(
+    IncidentCommentInner createOrUpdate(
         String resourceGroupName,
         String workspaceName,
         String incidentId,
         String incidentCommentId,
-        IncidentCommentInner incidentComment,
-        Context context);
+        IncidentCommentInner incidentComment);
 
     /**
      * Delete the incident comment.
@@ -140,12 +140,15 @@ Response<IncidentCommentInner> createOrUpdateWithResponse(
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param incidentCommentId Incident comment ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId);
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId, Context context);
 
     /**
      * Delete the incident comment.
@@ -154,13 +157,10 @@ Response<IncidentCommentInner> createOrUpdateWithResponse(
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param incidentCommentId Incident comment ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId, Context context);
+    void delete(String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/IncidentRelationsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/IncidentRelationsClient.java
index 8f2125a0506d..c3348eddef7d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/IncidentRelationsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/IncidentRelationsClient.java
@@ -56,21 +56,6 @@ PagedIterable<RelationInner> list(
         String skipToken,
         Context context);
 
-    /**
-     * Gets an incident relation.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param incidentId Incident ID.
-     * @param relationName Relation Name.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an incident relation.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    RelationInner get(String resourceGroupName, String workspaceName, String incidentId, String relationName);
-
     /**
      * Gets an incident relation.
      *
@@ -89,21 +74,19 @@ Response<RelationInner> getWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, String relationName, Context context);
 
     /**
-     * Creates or updates the incident relation.
+     * Gets an incident relation.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param relationName Relation Name.
-     * @param relation The relation model.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a relation between two resources.
+     * @return an incident relation.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    RelationInner createOrUpdate(
-        String resourceGroupName, String workspaceName, String incidentId, String relationName, RelationInner relation);
+    RelationInner get(String resourceGroupName, String workspaceName, String incidentId, String relationName);
 
     /**
      * Creates or updates the incident relation.
@@ -129,18 +112,21 @@ Response<RelationInner> createOrUpdateWithResponse(
         Context context);
 
     /**
-     * Delete the incident relation.
+     * Creates or updates the incident relation.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param relationName Relation Name.
+     * @param relation The relation model.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return represents a relation between two resources.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String incidentId, String relationName);
+    RelationInner createOrUpdate(
+        String resourceGroupName, String workspaceName, String incidentId, String relationName, RelationInner relation);
 
     /**
      * Delete the incident relation.
@@ -158,4 +144,18 @@ Response<RelationInner> createOrUpdateWithResponse(
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<Void> deleteWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, String relationName, Context context);
+
+    /**
+     * Delete the incident relation.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param incidentId Incident ID.
+     * @param relationName Relation Name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String workspaceName, String incidentId, String relationName);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/IncidentsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/IncidentsClient.java
index 12e0bda1f5e8..3ad1aca471cf 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/IncidentsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/IncidentsClient.java
@@ -25,13 +25,20 @@ public interface IncidentsClient {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentIdentifier The incidentIdentifier parameter.
+     * @param requestBody The requestBody parameter.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return any object.
+     * @return any object along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Object runPlaybook(String resourceGroupName, String workspaceName, String incidentIdentifier);
+    Response<Object> runPlaybookWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String incidentIdentifier,
+        ManualTriggerRequestBody requestBody,
+        Context context);
 
     /**
      * Triggers playbook on a specific incident.
@@ -39,20 +46,13 @@ public interface IncidentsClient {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentIdentifier The incidentIdentifier parameter.
-     * @param requestBody The requestBody parameter.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return any object along with {@link Response}.
+     * @return any object.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<Object> runPlaybookWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String incidentIdentifier,
-        ManualTriggerRequestBody requestBody,
-        Context context);
+    Object runPlaybook(String resourceGroupName, String workspaceName, String incidentIdentifier);
 
     /**
      * Gets all incidents.
@@ -94,20 +94,6 @@ PagedIterable<IncidentInner> list(
         String skipToken,
         Context context);
 
-    /**
-     * Gets an incident.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param incidentId Incident ID.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an incident.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    IncidentInner get(String resourceGroupName, String workspaceName, String incidentId);
-
     /**
      * Gets an incident.
      *
@@ -125,20 +111,18 @@ Response<IncidentInner> getWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, Context context);
 
     /**
-     * Creates or updates the incident.
+     * Gets an incident.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
-     * @param incident The incident.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents an incident in Azure Security Insights.
+     * @return an incident.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    IncidentInner createOrUpdate(
-        String resourceGroupName, String workspaceName, String incidentId, IncidentInner incident);
+    IncidentInner get(String resourceGroupName, String workspaceName, String incidentId);
 
     /**
      * Creates or updates the incident.
@@ -158,17 +142,20 @@ Response<IncidentInner> createOrUpdateWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, IncidentInner incident, Context context);
 
     /**
-     * Delete the incident.
+     * Creates or updates the incident.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
+     * @param incident The incident.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return represents an incident in Azure Security Insights.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String incidentId);
+    IncidentInner createOrUpdate(
+        String resourceGroupName, String workspaceName, String incidentId, IncidentInner incident);
 
     /**
      * Delete the incident.
@@ -187,20 +174,17 @@ Response<Void> deleteWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, Context context);
 
     /**
-     * Creates a Microsoft team to investigate the incident by sharing information and insights between participants.
+     * Delete the incident.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
-     * @param teamProperties Team properties.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes team information.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    TeamInformationInner createTeam(
-        String resourceGroupName, String workspaceName, String incidentId, TeamProperties teamProperties);
+    void delete(String resourceGroupName, String workspaceName, String incidentId);
 
     /**
      * Creates a Microsoft team to investigate the incident by sharing information and insights between participants.
@@ -224,18 +208,20 @@ Response<TeamInformationInner> createTeamWithResponse(
         Context context);
 
     /**
-     * Gets all incident alerts.
+     * Creates a Microsoft team to investigate the incident by sharing information and insights between participants.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
+     * @param teamProperties Team properties.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all incident alerts.
+     * @return describes team information.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    IncidentAlertListInner listAlerts(String resourceGroupName, String workspaceName, String incidentId);
+    TeamInformationInner createTeam(
+        String resourceGroupName, String workspaceName, String incidentId, TeamProperties teamProperties);
 
     /**
      * Gets all incident alerts.
@@ -254,7 +240,7 @@ Response<IncidentAlertListInner> listAlertsWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, Context context);
 
     /**
-     * Gets all incident bookmarks.
+     * Gets all incident alerts.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
@@ -262,10 +248,10 @@ Response<IncidentAlertListInner> listAlertsWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all incident bookmarks.
+     * @return all incident alerts.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    IncidentBookmarkListInner listBookmarks(String resourceGroupName, String workspaceName, String incidentId);
+    IncidentAlertListInner listAlerts(String resourceGroupName, String workspaceName, String incidentId);
 
     /**
      * Gets all incident bookmarks.
@@ -284,7 +270,7 @@ Response<IncidentBookmarkListInner> listBookmarksWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, Context context);
 
     /**
-     * Gets all incident related entities.
+     * Gets all incident bookmarks.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
@@ -292,10 +278,10 @@ Response<IncidentBookmarkListInner> listBookmarksWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all incident related entities.
+     * @return all incident bookmarks.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    IncidentEntitiesResponseInner listEntities(String resourceGroupName, String workspaceName, String incidentId);
+    IncidentBookmarkListInner listBookmarks(String resourceGroupName, String workspaceName, String incidentId);
 
     /**
      * Gets all incident related entities.
@@ -312,4 +298,18 @@ Response<IncidentBookmarkListInner> listBookmarksWithResponse(
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<IncidentEntitiesResponseInner> listEntitiesWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, Context context);
+
+    /**
+     * Gets all incident related entities.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param incidentId Incident ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return all incident related entities.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    IncidentEntitiesResponseInner listEntities(String resourceGroupName, String workspaceName, String incidentId);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/IpGeodatasClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/IpGeodatasClient.java
index 50c85d732cb8..7edc1995d469 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/IpGeodatasClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/IpGeodatasClient.java
@@ -17,25 +17,25 @@ public interface IpGeodatasClient {
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param ipAddress IP address (v4 or v6) to be enriched.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return geodata for a single IP address.
+     * @return geodata for a single IP address along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    EnrichmentIpGeodataInner get(String resourceGroupName, String ipAddress);
+    Response<EnrichmentIpGeodataInner> getWithResponse(String resourceGroupName, String ipAddress, Context context);
 
     /**
      * Get geodata for a single IP address.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param ipAddress IP address (v4 or v6) to be enriched.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return geodata for a single IP address along with {@link Response}.
+     * @return geodata for a single IP address.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<EnrichmentIpGeodataInner> getWithResponse(String resourceGroupName, String ipAddress, Context context);
+    EnrichmentIpGeodataInner get(String resourceGroupName, String ipAddress);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/MetadatasClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/MetadatasClient.java
index a42eaa9112f1..c54168b52e0d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/MetadatasClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/MetadatasClient.java
@@ -53,20 +53,6 @@ PagedIterable<MetadataModelInner> list(
         Integer skip,
         Context context);
 
-    /**
-     * Get a Metadata.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param metadataName The Metadata name.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a Metadata.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    MetadataModelInner get(String resourceGroupName, String workspaceName, String metadataName);
-
     /**
      * Get a Metadata.
      *
@@ -84,7 +70,7 @@ Response<MetadataModelInner> getWithResponse(
         String resourceGroupName, String workspaceName, String metadataName, Context context);
 
     /**
-     * Delete a Metadata.
+     * Get a Metadata.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
@@ -92,9 +78,10 @@ Response<MetadataModelInner> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a Metadata.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String metadataName);
+    MetadataModelInner get(String resourceGroupName, String workspaceName, String metadataName);
 
     /**
      * Delete a Metadata.
@@ -113,20 +100,17 @@ Response<Void> deleteWithResponse(
         String resourceGroupName, String workspaceName, String metadataName, Context context);
 
     /**
-     * Create a Metadata.
+     * Delete a Metadata.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param metadataName The Metadata name.
-     * @param metadata Metadata resource.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return metadata resource definition.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    MetadataModelInner create(
-        String resourceGroupName, String workspaceName, String metadataName, MetadataModelInner metadata);
+    void delete(String resourceGroupName, String workspaceName, String metadataName);
 
     /**
      * Create a Metadata.
@@ -150,20 +134,20 @@ Response<MetadataModelInner> createWithResponse(
         Context context);
 
     /**
-     * Update an existing Metadata.
+     * Create a Metadata.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param metadataName The Metadata name.
-     * @param metadataPatch Partial metadata request.
+     * @param metadata Metadata resource.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return metadata resource definition.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    MetadataModelInner update(
-        String resourceGroupName, String workspaceName, String metadataName, MetadataPatch metadataPatch);
+    MetadataModelInner create(
+        String resourceGroupName, String workspaceName, String metadataName, MetadataModelInner metadata);
 
     /**
      * Update an existing Metadata.
@@ -185,4 +169,20 @@ Response<MetadataModelInner> updateWithResponse(
         String metadataName,
         MetadataPatch metadataPatch,
         Context context);
+
+    /**
+     * Update an existing Metadata.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param metadataName The Metadata name.
+     * @param metadataPatch Partial metadata request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return metadata resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    MetadataModelInner update(
+        String resourceGroupName, String workspaceName, String metadataName, MetadataPatch metadataPatch);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/OfficeConsentsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/OfficeConsentsClient.java
index 09ab2236789b..2a7969042a81 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/OfficeConsentsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/OfficeConsentsClient.java
@@ -46,13 +46,15 @@ public interface OfficeConsentsClient {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param consentId consent ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an office365 consent.
+     * @return an office365 consent along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    OfficeConsentInner get(String resourceGroupName, String workspaceName, String consentId);
+    Response<OfficeConsentInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String consentId, Context context);
 
     /**
      * Gets an office365 consent.
@@ -60,15 +62,13 @@ public interface OfficeConsentsClient {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param consentId consent ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an office365 consent along with {@link Response}.
+     * @return an office365 consent.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<OfficeConsentInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String consentId, Context context);
+    OfficeConsentInner get(String resourceGroupName, String workspaceName, String consentId);
 
     /**
      * Delete the office365 consent.
@@ -76,12 +76,15 @@ Response<OfficeConsentInner> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param consentId consent ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String consentId);
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String consentId, Context context);
 
     /**
      * Delete the office365 consent.
@@ -89,13 +92,10 @@ Response<OfficeConsentInner> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param consentId consent ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String consentId, Context context);
+    void delete(String resourceGroupName, String workspaceName, String consentId);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/ProductSettingsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/ProductSettingsClient.java
index ddb0f006d6b3..3711cbf68a26 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/ProductSettingsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/ProductSettingsClient.java
@@ -18,27 +18,27 @@ public interface ProductSettingsClient {
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return list of all the settings.
+     * @return list of all the settings along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    SettingListInner list(String resourceGroupName, String workspaceName);
+    Response<SettingListInner> listWithResponse(String resourceGroupName, String workspaceName, Context context);
 
     /**
      * List of all the settings.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return list of all the settings along with {@link Response}.
+     * @return list of all the settings.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<SettingListInner> listWithResponse(String resourceGroupName, String workspaceName, Context context);
+    SettingListInner list(String resourceGroupName, String workspaceName);
 
     /**
      * Gets a setting.
@@ -46,13 +46,15 @@ public interface ProductSettingsClient {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsName The setting name. Supports - Anomalies, EyesOn, EntityAnalytics, Ueba.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a setting.
+     * @return a setting along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    SettingsInner get(String resourceGroupName, String workspaceName, String settingsName);
+    Response<SettingsInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String settingsName, Context context);
 
     /**
      * Gets a setting.
@@ -60,15 +62,13 @@ public interface ProductSettingsClient {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsName The setting name. Supports - Anomalies, EyesOn, EntityAnalytics, Ueba.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a setting along with {@link Response}.
+     * @return a setting.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<SettingsInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String settingsName, Context context);
+    SettingsInner get(String resourceGroupName, String workspaceName, String settingsName);
 
     /**
      * Delete setting of the product.
@@ -76,12 +76,15 @@ Response<SettingsInner> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsName The setting name. Supports - Anomalies, EyesOn, EntityAnalytics, Ueba.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String settingsName);
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String settingsName, Context context);
 
     /**
      * Delete setting of the product.
@@ -89,15 +92,12 @@ Response<SettingsInner> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsName The setting name. Supports - Anomalies, EyesOn, EntityAnalytics, Ueba.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String settingsName, Context context);
+    void delete(String resourceGroupName, String workspaceName, String settingsName);
 
     /**
      * Updates setting.
@@ -106,13 +106,15 @@ Response<Void> deleteWithResponse(
      * @param workspaceName The name of the workspace.
      * @param settingsName The setting name. Supports - Anomalies, EyesOn, EntityAnalytics, Ueba.
      * @param settings The setting.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Setting.
+     * @return the Setting along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    SettingsInner update(String resourceGroupName, String workspaceName, String settingsName, SettingsInner settings);
+    Response<SettingsInner> updateWithResponse(
+        String resourceGroupName, String workspaceName, String settingsName, SettingsInner settings, Context context);
 
     /**
      * Updates setting.
@@ -121,13 +123,11 @@ Response<Void> deleteWithResponse(
      * @param workspaceName The name of the workspace.
      * @param settingsName The setting name. Supports - Anomalies, EyesOn, EntityAnalytics, Ueba.
      * @param settings The setting.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Setting along with {@link Response}.
+     * @return the Setting.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<SettingsInner> updateWithResponse(
-        String resourceGroupName, String workspaceName, String settingsName, SettingsInner settings, Context context);
+    SettingsInner update(String resourceGroupName, String workspaceName, String settingsName, SettingsInner settings);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/SecurityInsights.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/SecurityInsights.java
index 4d9c0b816c82..33e5893be8ae 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/SecurityInsights.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/SecurityInsights.java
@@ -261,6 +261,13 @@ public interface SecurityInsights {
      */
     WatchlistItemsClient getWatchlistItems();
 
+    /**
+     * Gets the WorkspaceManagerConfigurationsClient object to access its operations.
+     *
+     * @return the WorkspaceManagerConfigurationsClient object.
+     */
+    WorkspaceManagerConfigurationsClient getWorkspaceManagerConfigurations();
+
     /**
      * Gets the DataConnectorsClient object to access its operations.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/SecurityMLAnalyticsSettingsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/SecurityMLAnalyticsSettingsClient.java
index 421b46427588..4a2af29bc349 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/SecurityMLAnalyticsSettingsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/SecurityMLAnalyticsSettingsClient.java
@@ -47,13 +47,15 @@ PagedIterable<SecurityMLAnalyticsSettingInner> list(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Security ML Analytics Settings.
+     * @return the Security ML Analytics Settings along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    SecurityMLAnalyticsSettingInner get(String resourceGroupName, String workspaceName, String settingsResourceName);
+    Response<SecurityMLAnalyticsSettingInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String settingsResourceName, Context context);
 
     /**
      * Gets the Security ML Analytics Settings.
@@ -61,15 +63,13 @@ PagedIterable<SecurityMLAnalyticsSettingInner> list(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Security ML Analytics Settings along with {@link Response}.
+     * @return the Security ML Analytics Settings.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<SecurityMLAnalyticsSettingInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String settingsResourceName, Context context);
+    SecurityMLAnalyticsSettingInner get(String resourceGroupName, String workspaceName, String settingsResourceName);
 
     /**
      * Creates or updates the Security ML Analytics Settings.
@@ -78,17 +78,19 @@ Response<SecurityMLAnalyticsSettingInner> getWithResponse(
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
      * @param securityMLAnalyticsSetting The security ML Analytics setting.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return security ML Analytics Setting.
+     * @return security ML Analytics Setting along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    SecurityMLAnalyticsSettingInner createOrUpdate(
+    Response<SecurityMLAnalyticsSettingInner> createOrUpdateWithResponse(
         String resourceGroupName,
         String workspaceName,
         String settingsResourceName,
-        SecurityMLAnalyticsSettingInner securityMLAnalyticsSetting);
+        SecurityMLAnalyticsSettingInner securityMLAnalyticsSetting,
+        Context context);
 
     /**
      * Creates or updates the Security ML Analytics Settings.
@@ -97,19 +99,17 @@ SecurityMLAnalyticsSettingInner createOrUpdate(
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
      * @param securityMLAnalyticsSetting The security ML Analytics setting.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return security ML Analytics Setting along with {@link Response}.
+     * @return security ML Analytics Setting.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<SecurityMLAnalyticsSettingInner> createOrUpdateWithResponse(
+    SecurityMLAnalyticsSettingInner createOrUpdate(
         String resourceGroupName,
         String workspaceName,
         String settingsResourceName,
-        SecurityMLAnalyticsSettingInner securityMLAnalyticsSetting,
-        Context context);
+        SecurityMLAnalyticsSettingInner securityMLAnalyticsSetting);
 
     /**
      * Delete the Security ML Analytics Settings.
@@ -117,12 +117,15 @@ Response<SecurityMLAnalyticsSettingInner> createOrUpdateWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String settingsResourceName);
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String settingsResourceName, Context context);
 
     /**
      * Delete the Security ML Analytics Settings.
@@ -130,13 +133,10 @@ Response<SecurityMLAnalyticsSettingInner> createOrUpdateWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String settingsResourceName, Context context);
+    void delete(String resourceGroupName, String workspaceName, String settingsResourceName);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/SentinelOnboardingStatesClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/SentinelOnboardingStatesClient.java
index 10a75e9aee2e..500eef1cdbde 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/SentinelOnboardingStatesClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/SentinelOnboardingStatesClient.java
@@ -13,21 +13,6 @@
 
 /** An instance of this class provides access to all the operations defined in SentinelOnboardingStatesClient. */
 public interface SentinelOnboardingStatesClient {
-    /**
-     * Get Sentinel onboarding state.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param sentinelOnboardingStateName The Sentinel onboarding state name. Supports - default.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return sentinel onboarding state.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    SentinelOnboardingStateInner get(
-        String resourceGroupName, String workspaceName, String sentinelOnboardingStateName);
-
     /**
      * Get Sentinel onboarding state.
      *
@@ -45,7 +30,7 @@ Response<SentinelOnboardingStateInner> getWithResponse(
         String resourceGroupName, String workspaceName, String sentinelOnboardingStateName, Context context);
 
     /**
-     * Create Sentinel onboarding state.
+     * Get Sentinel onboarding state.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
@@ -56,7 +41,7 @@ Response<SentinelOnboardingStateInner> getWithResponse(
      * @return sentinel onboarding state.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    SentinelOnboardingStateInner create(
+    SentinelOnboardingStateInner get(
         String resourceGroupName, String workspaceName, String sentinelOnboardingStateName);
 
     /**
@@ -81,7 +66,7 @@ Response<SentinelOnboardingStateInner> createWithResponse(
         Context context);
 
     /**
-     * Delete Sentinel onboarding state.
+     * Create Sentinel onboarding state.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
@@ -89,9 +74,11 @@ Response<SentinelOnboardingStateInner> createWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return sentinel onboarding state.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String sentinelOnboardingStateName);
+    SentinelOnboardingStateInner create(
+        String resourceGroupName, String workspaceName, String sentinelOnboardingStateName);
 
     /**
      * Delete Sentinel onboarding state.
@@ -110,17 +97,17 @@ Response<Void> deleteWithResponse(
         String resourceGroupName, String workspaceName, String sentinelOnboardingStateName, Context context);
 
     /**
-     * Gets all Sentinel onboarding states.
+     * Delete Sentinel onboarding state.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
+     * @param sentinelOnboardingStateName The Sentinel onboarding state name. Supports - default.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all Sentinel onboarding states.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    SentinelOnboardingStatesListInner list(String resourceGroupName, String workspaceName);
+    void delete(String resourceGroupName, String workspaceName, String sentinelOnboardingStateName);
 
     /**
      * Gets all Sentinel onboarding states.
@@ -136,4 +123,17 @@ Response<Void> deleteWithResponse(
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<SentinelOnboardingStatesListInner> listWithResponse(
         String resourceGroupName, String workspaceName, Context context);
+
+    /**
+     * Gets all Sentinel onboarding states.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return all Sentinel onboarding states.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    SentinelOnboardingStatesListInner list(String resourceGroupName, String workspaceName);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/SourceControlsOperationsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/SourceControlsOperationsClient.java
index cbf7109c8ebb..c5f05f4d7c0c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/SourceControlsOperationsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/SourceControlsOperationsClient.java
@@ -40,20 +40,6 @@ public interface SourceControlsOperationsClient {
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<SourceControlInner> list(String resourceGroupName, String workspaceName, Context context);
 
-    /**
-     * Gets a source control byt its identifier.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param sourceControlId Source control Id.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a source control byt its identifier.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    SourceControlInner get(String resourceGroupName, String workspaceName, String sourceControlId);
-
     /**
      * Gets a source control byt its identifier.
      *
@@ -71,7 +57,7 @@ Response<SourceControlInner> getWithResponse(
         String resourceGroupName, String workspaceName, String sourceControlId, Context context);
 
     /**
-     * Delete a source control.
+     * Gets a source control byt its identifier.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
@@ -79,9 +65,10 @@ Response<SourceControlInner> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a source control byt its identifier.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String sourceControlId);
+    SourceControlInner get(String resourceGroupName, String workspaceName, String sourceControlId);
 
     /**
      * Delete a source control.
@@ -100,20 +87,17 @@ Response<Void> deleteWithResponse(
         String resourceGroupName, String workspaceName, String sourceControlId, Context context);
 
     /**
-     * Creates a source control.
+     * Delete a source control.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sourceControlId Source control Id.
-     * @param sourceControl The SourceControl.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a SourceControl in Azure Security Insights.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    SourceControlInner create(
-        String resourceGroupName, String workspaceName, String sourceControlId, SourceControlInner sourceControl);
+    void delete(String resourceGroupName, String workspaceName, String sourceControlId);
 
     /**
      * Creates a source control.
@@ -135,4 +119,20 @@ Response<SourceControlInner> createWithResponse(
         String sourceControlId,
         SourceControlInner sourceControl,
         Context context);
+
+    /**
+     * Creates a source control.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param sourceControlId Source control Id.
+     * @param sourceControl The SourceControl.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return represents a SourceControl in Azure Security Insights.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    SourceControlInner create(
+        String resourceGroupName, String workspaceName, String sourceControlId, SourceControlInner sourceControl);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/ThreatIntelligenceIndicatorMetricsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/ThreatIntelligenceIndicatorMetricsClient.java
index 326b9eedc2e1..7c8b95c16111 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/ThreatIntelligenceIndicatorMetricsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/ThreatIntelligenceIndicatorMetricsClient.java
@@ -19,27 +19,27 @@ public interface ThreatIntelligenceIndicatorMetricsClient {
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence indicators metrics (Indicators counts by Type, Threat Type, Source).
+     * @return threat intelligence indicators metrics (Indicators counts by Type, Threat Type, Source) along with {@link
+     *     Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    ThreatIntelligenceMetricsListInner list(String resourceGroupName, String workspaceName);
+    Response<ThreatIntelligenceMetricsListInner> listWithResponse(
+        String resourceGroupName, String workspaceName, Context context);
 
     /**
      * Get threat intelligence indicators metrics (Indicators counts by Type, Threat Type, Source).
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence indicators metrics (Indicators counts by Type, Threat Type, Source) along with {@link
-     *     Response}.
+     * @return threat intelligence indicators metrics (Indicators counts by Type, Threat Type, Source).
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<ThreatIntelligenceMetricsListInner> listWithResponse(
-        String resourceGroupName, String workspaceName, Context context);
+    ThreatIntelligenceMetricsListInner list(String resourceGroupName, String workspaceName);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/ThreatIntelligenceIndicatorsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/ThreatIntelligenceIndicatorsClient.java
index 1e34a2b75f05..b8bcc35455e3 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/ThreatIntelligenceIndicatorsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/ThreatIntelligenceIndicatorsClient.java
@@ -16,21 +16,6 @@
 
 /** An instance of this class provides access to all the operations defined in ThreatIntelligenceIndicatorsClient. */
 public interface ThreatIntelligenceIndicatorsClient {
-    /**
-     * Create a new threat intelligence indicator.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param threatIntelligenceProperties Properties of threat intelligence indicators to create and update.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence information object.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    ThreatIntelligenceInformationInner createIndicator(
-        String resourceGroupName, String workspaceName, ThreatIntelligenceIndicatorModel threatIntelligenceProperties);
-
     /**
      * Create a new threat intelligence indicator.
      *
@@ -51,18 +36,19 @@ Response<ThreatIntelligenceInformationInner> createIndicatorWithResponse(
         Context context);
 
     /**
-     * View a threat intelligence indicator by name.
+     * Create a new threat intelligence indicator.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
-     * @param name Threat intelligence indicator name field.
+     * @param threatIntelligenceProperties Properties of threat intelligence indicators to create and update.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return threat intelligence information object.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    ThreatIntelligenceInformationInner get(String resourceGroupName, String workspaceName, String name);
+    ThreatIntelligenceInformationInner createIndicator(
+        String resourceGroupName, String workspaceName, ThreatIntelligenceIndicatorModel threatIntelligenceProperties);
 
     /**
      * View a threat intelligence indicator by name.
@@ -81,23 +67,18 @@ Response<ThreatIntelligenceInformationInner> getWithResponse(
         String resourceGroupName, String workspaceName, String name, Context context);
 
     /**
-     * Update a threat Intelligence indicator.
+     * View a threat intelligence indicator by name.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
-     * @param threatIntelligenceProperties Properties of threat intelligence indicators to create and update.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return threat intelligence information object.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    ThreatIntelligenceInformationInner create(
-        String resourceGroupName,
-        String workspaceName,
-        String name,
-        ThreatIntelligenceIndicatorModel threatIntelligenceProperties);
+    ThreatIntelligenceInformationInner get(String resourceGroupName, String workspaceName, String name);
 
     /**
      * Update a threat Intelligence indicator.
@@ -121,17 +102,23 @@ Response<ThreatIntelligenceInformationInner> createWithResponse(
         Context context);
 
     /**
-     * Delete a threat intelligence indicator.
+     * Update a threat Intelligence indicator.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
+     * @param threatIntelligenceProperties Properties of threat intelligence indicators to create and update.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return threat intelligence information object.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String name);
+    ThreatIntelligenceInformationInner create(
+        String resourceGroupName,
+        String workspaceName,
+        String name,
+        ThreatIntelligenceIndicatorModel threatIntelligenceProperties);
 
     /**
      * Delete a threat intelligence indicator.
@@ -148,6 +135,19 @@ Response<ThreatIntelligenceInformationInner> createWithResponse(
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<Void> deleteWithResponse(String resourceGroupName, String workspaceName, String name, Context context);
 
+    /**
+     * Delete a threat intelligence indicator.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param name Threat intelligence indicator name field.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String workspaceName, String name);
+
     /**
      * Query threat intelligence indicators as per filtering criteria.
      *
@@ -191,16 +191,19 @@ PagedIterable<ThreatIntelligenceInformationInner> queryIndicators(
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
      * @param threatIntelligenceAppendTags The threat intelligence append tags request body.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void appendTags(
+    Response<Void> appendTagsWithResponse(
         String resourceGroupName,
         String workspaceName,
         String name,
-        ThreatIntelligenceAppendTags threatIntelligenceAppendTags);
+        ThreatIntelligenceAppendTags threatIntelligenceAppendTags,
+        Context context);
 
     /**
      * Append tags to a threat intelligence indicator.
@@ -209,19 +212,16 @@ void appendTags(
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
      * @param threatIntelligenceAppendTags The threat intelligence append tags request body.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<Void> appendTagsWithResponse(
+    void appendTags(
         String resourceGroupName,
         String workspaceName,
         String name,
-        ThreatIntelligenceAppendTags threatIntelligenceAppendTags,
-        Context context);
+        ThreatIntelligenceAppendTags threatIntelligenceAppendTags);
 
     /**
      * Replace tags added to a threat intelligence indicator.
@@ -230,17 +230,19 @@ Response<Void> appendTagsWithResponse(
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
      * @param threatIntelligenceReplaceTags Tags in the threat intelligence indicator to be replaced.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence information object.
+     * @return threat intelligence information object along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    ThreatIntelligenceInformationInner replaceTags(
+    Response<ThreatIntelligenceInformationInner> replaceTagsWithResponse(
         String resourceGroupName,
         String workspaceName,
         String name,
-        ThreatIntelligenceIndicatorModel threatIntelligenceReplaceTags);
+        ThreatIntelligenceIndicatorModel threatIntelligenceReplaceTags,
+        Context context);
 
     /**
      * Replace tags added to a threat intelligence indicator.
@@ -249,17 +251,15 @@ ThreatIntelligenceInformationInner replaceTags(
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
      * @param threatIntelligenceReplaceTags Tags in the threat intelligence indicator to be replaced.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence information object along with {@link Response}.
+     * @return threat intelligence information object.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<ThreatIntelligenceInformationInner> replaceTagsWithResponse(
+    ThreatIntelligenceInformationInner replaceTags(
         String resourceGroupName,
         String workspaceName,
         String name,
-        ThreatIntelligenceIndicatorModel threatIntelligenceReplaceTags,
-        Context context);
+        ThreatIntelligenceIndicatorModel threatIntelligenceReplaceTags);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/WatchlistItemsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/WatchlistItemsClient.java
index 80ba49f0d3be..122ba7a8ee9c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/WatchlistItemsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/WatchlistItemsClient.java
@@ -53,14 +53,15 @@ PagedIterable<WatchlistItemInner> list(
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
      * @param watchlistItemId Watchlist Item Id (GUID).
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a watchlist, without its watchlist items.
+     * @return a watchlist, without its watchlist items along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    WatchlistItemInner get(
-        String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId);
+    Response<WatchlistItemInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId, Context context);
 
     /**
      * Gets a watchlist, without its watchlist items.
@@ -69,15 +70,14 @@ WatchlistItemInner get(
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
      * @param watchlistItemId Watchlist Item Id (GUID).
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a watchlist, without its watchlist items along with {@link Response}.
+     * @return a watchlist, without its watchlist items.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<WatchlistItemInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId, Context context);
+    WatchlistItemInner get(
+        String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId);
 
     /**
      * Delete a watchlist item.
@@ -86,12 +86,15 @@ Response<WatchlistItemInner> getWithResponse(
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
      * @param watchlistItemId Watchlist Item Id (GUID).
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId);
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId, Context context);
 
     /**
      * Delete a watchlist item.
@@ -100,15 +103,12 @@ Response<WatchlistItemInner> getWithResponse(
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
      * @param watchlistItemId Watchlist Item Id (GUID).
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId, Context context);
+    void delete(String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId);
 
     /**
      * Creates or updates a watchlist item.
@@ -118,18 +118,20 @@ Response<Void> deleteWithResponse(
      * @param watchlistAlias Watchlist Alias.
      * @param watchlistItemId Watchlist Item Id (GUID).
      * @param watchlistItem The watchlist item.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a Watchlist item in Azure Security Insights.
+     * @return represents a Watchlist item in Azure Security Insights along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    WatchlistItemInner createOrUpdate(
+    Response<WatchlistItemInner> createOrUpdateWithResponse(
         String resourceGroupName,
         String workspaceName,
         String watchlistAlias,
         String watchlistItemId,
-        WatchlistItemInner watchlistItem);
+        WatchlistItemInner watchlistItem,
+        Context context);
 
     /**
      * Creates or updates a watchlist item.
@@ -139,18 +141,16 @@ WatchlistItemInner createOrUpdate(
      * @param watchlistAlias Watchlist Alias.
      * @param watchlistItemId Watchlist Item Id (GUID).
      * @param watchlistItem The watchlist item.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a Watchlist item in Azure Security Insights along with {@link Response}.
+     * @return represents a Watchlist item in Azure Security Insights.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<WatchlistItemInner> createOrUpdateWithResponse(
+    WatchlistItemInner createOrUpdate(
         String resourceGroupName,
         String workspaceName,
         String watchlistAlias,
         String watchlistItemId,
-        WatchlistItemInner watchlistItem,
-        Context context);
+        WatchlistItemInner watchlistItem);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/WatchlistsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/WatchlistsClient.java
index 10b174e1207f..682536c9ff54 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/WatchlistsClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/WatchlistsClient.java
@@ -52,13 +52,15 @@ PagedIterable<WatchlistInner> list(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a watchlist, without its watchlist items.
+     * @return a watchlist, without its watchlist items along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    WatchlistInner get(String resourceGroupName, String workspaceName, String watchlistAlias);
+    Response<WatchlistInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String watchlistAlias, Context context);
 
     /**
      * Gets a watchlist, without its watchlist items.
@@ -66,15 +68,13 @@ PagedIterable<WatchlistInner> list(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a watchlist, without its watchlist items along with {@link Response}.
+     * @return a watchlist, without its watchlist items.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<WatchlistInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String watchlistAlias, Context context);
+    WatchlistInner get(String resourceGroupName, String workspaceName, String watchlistAlias);
 
     /**
      * Delete a watchlist.
@@ -82,12 +82,15 @@ Response<WatchlistInner> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String workspaceName, String watchlistAlias);
+    WatchlistsDeleteResponse deleteWithResponse(
+        String resourceGroupName, String workspaceName, String watchlistAlias, Context context);
 
     /**
      * Delete a watchlist.
@@ -95,15 +98,12 @@ Response<WatchlistInner> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    WatchlistsDeleteResponse deleteWithResponse(
-        String resourceGroupName, String workspaceName, String watchlistAlias, Context context);
+    void delete(String resourceGroupName, String workspaceName, String watchlistAlias);
 
     /**
      * Create or update a Watchlist and its Watchlist Items (bulk creation, e.g. through text/csv content type). To
@@ -116,14 +116,19 @@ WatchlistsDeleteResponse deleteWithResponse(
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
      * @param watchlist The watchlist.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Watchlist in Azure Security Insights.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    WatchlistInner createOrUpdate(
-        String resourceGroupName, String workspaceName, String watchlistAlias, WatchlistInner watchlist);
+    WatchlistsCreateOrUpdateResponse createOrUpdateWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String watchlistAlias,
+        WatchlistInner watchlist,
+        Context context);
 
     /**
      * Create or update a Watchlist and its Watchlist Items (bulk creation, e.g. through text/csv content type). To
@@ -136,17 +141,12 @@ WatchlistInner createOrUpdate(
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
      * @param watchlist The watchlist.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Watchlist in Azure Security Insights.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    WatchlistsCreateOrUpdateResponse createOrUpdateWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String watchlistAlias,
-        WatchlistInner watchlist,
-        Context context);
+    WatchlistInner createOrUpdate(
+        String resourceGroupName, String workspaceName, String watchlistAlias, WatchlistInner watchlist);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/WorkspaceManagerConfigurationsClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/WorkspaceManagerConfigurationsClient.java
new file mode 100644
index 000000000000..063a2af5cbcd
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/WorkspaceManagerConfigurationsClient.java
@@ -0,0 +1,150 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.fluent;
+
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.util.Context;
+import com.azure.resourcemanager.securityinsights.fluent.models.WorkspaceManagerConfigurationInner;
+
+/** An instance of this class provides access to all the operations defined in WorkspaceManagerConfigurationsClient. */
+public interface WorkspaceManagerConfigurationsClient {
+    /**
+     * Gets all workspace manager configurations for a Sentinel workspace.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return all workspace manager configurations for a Sentinel workspace as paginated response with {@link
+     *     PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<WorkspaceManagerConfigurationInner> list(String resourceGroupName, String workspaceName);
+
+    /**
+     * Gets all workspace manager configurations for a Sentinel workspace.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param orderby Sorts the results. Optional.
+     * @param top Returns only the first n results. Optional.
+     * @param skipToken Skiptoken is only used if a previous operation returned a partial result. If a previous response
+     *     contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that
+     *     specifies a starting point to use for subsequent calls. Optional.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return all workspace manager configurations for a Sentinel workspace as paginated response with {@link
+     *     PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<WorkspaceManagerConfigurationInner> list(
+        String resourceGroupName, String workspaceName, String orderby, Integer top, String skipToken, Context context);
+
+    /**
+     * Gets a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a workspace manager configuration along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<WorkspaceManagerConfigurationInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName, Context context);
+
+    /**
+     * Gets a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a workspace manager configuration.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    WorkspaceManagerConfigurationInner get(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName);
+
+    /**
+     * Deletes a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName, Context context);
+
+    /**
+     * Deletes a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName);
+
+    /**
+     * Creates or updates a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @param workspaceManagerConfiguration The workspace manager configuration.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the workspace manager configuration along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<WorkspaceManagerConfigurationInner> createOrUpdateWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String workspaceManagerConfigurationName,
+        WorkspaceManagerConfigurationInner workspaceManagerConfiguration,
+        Context context);
+
+    /**
+     * Creates or updates a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @param workspaceManagerConfiguration The workspace manager configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the workspace manager configuration.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    WorkspaceManagerConfigurationInner createOrUpdate(
+        String resourceGroupName,
+        String workspaceName,
+        String workspaceManagerConfigurationName,
+        WorkspaceManagerConfigurationInner workspaceManagerConfiguration);
+}
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AadCheckRequirementsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AadCheckRequirementsProperties.java
index ca6a6d8e19e0..204a2b0ca6b9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AadCheckRequirementsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AadCheckRequirementsProperties.java
@@ -10,6 +10,10 @@
 /** AAD (Azure Active Directory) requirements check properties. */
 @Fluent
 public final class AadCheckRequirementsProperties extends DataConnectorTenantId {
+    /** Creates an instance of AadCheckRequirementsProperties class. */
+    public AadCheckRequirementsProperties() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public AadCheckRequirementsProperties withTenantId(String tenantId) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AadDataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AadDataConnectorProperties.java
index be85a145cdd0..9dd51c22c450 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AadDataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AadDataConnectorProperties.java
@@ -18,6 +18,10 @@ public final class AadDataConnectorProperties extends DataConnectorTenantId {
     @JsonProperty(value = "dataTypes")
     private AlertsDataTypeOfDataConnector dataTypes;
 
+    /** Creates an instance of AadDataConnectorProperties class. */
+    public AadDataConnectorProperties() {
+    }
+
     /**
      * Get the dataTypes property: The available data types for the connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AatpCheckRequirementsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AatpCheckRequirementsProperties.java
index ee6d93cd9141..6c7b1aeb9e0c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AatpCheckRequirementsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AatpCheckRequirementsProperties.java
@@ -10,6 +10,10 @@
 /** AATP (Azure Advanced Threat Protection) requirements check properties. */
 @Fluent
 public final class AatpCheckRequirementsProperties extends DataConnectorTenantId {
+    /** Creates an instance of AatpCheckRequirementsProperties class. */
+    public AatpCheckRequirementsProperties() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public AatpCheckRequirementsProperties withTenantId(String tenantId) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AatpDataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AatpDataConnectorProperties.java
index 3a0bdc1ed428..40f02df994d0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AatpDataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AatpDataConnectorProperties.java
@@ -18,6 +18,10 @@ public final class AatpDataConnectorProperties extends DataConnectorTenantId {
     @JsonProperty(value = "dataTypes")
     private AlertsDataTypeOfDataConnector dataTypes;
 
+    /** Creates an instance of AatpDataConnectorProperties class. */
+    public AatpDataConnectorProperties() {
+    }
+
     /**
      * Get the dataTypes property: The available data types for the connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AccountEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AccountEntityProperties.java
index 22c53e70b336..1563c755d3e1 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AccountEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AccountEntityProperties.java
@@ -86,6 +86,10 @@ public final class AccountEntityProperties extends EntityCommonProperties {
     @JsonProperty(value = "dnsDomain", access = JsonProperty.Access.WRITE_ONLY)
     private String dnsDomain;
 
+    /** Creates an instance of AccountEntityProperties class. */
+    public AccountEntityProperties() {
+    }
+
     /**
      * Get the aadTenantId property: The Azure Active Directory tenant id.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActionRequestProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActionRequestProperties.java
index 412a0c40b92e..67708914e084 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActionRequestProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActionRequestProperties.java
@@ -18,6 +18,10 @@ public final class ActionRequestProperties extends ActionPropertiesBase {
     @JsonProperty(value = "triggerUri", required = true)
     private String triggerUri;
 
+    /** Creates an instance of ActionRequestProperties class. */
+    public ActionRequestProperties() {
+    }
+
     /**
      * Get the triggerUri property: Logic App Callback URL for this specific workflow.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActionResponseInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActionResponseInner.java
index 3122bbedd575..59f6d9376c5c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActionResponseInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActionResponseInner.java
@@ -17,6 +17,10 @@ public final class ActionResponseInner extends ResourceWithEtag {
     @JsonProperty(value = "properties")
     private ActionResponseProperties innerProperties;
 
+    /** Creates an instance of ActionResponseInner class. */
+    public ActionResponseInner() {
+    }
+
     /**
      * Get the innerProperties property: Action properties for get request.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActionResponseProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActionResponseProperties.java
index 0661a17d6444..785b119c87b9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActionResponseProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActionResponseProperties.java
@@ -17,6 +17,10 @@ public final class ActionResponseProperties extends ActionPropertiesBase {
     @JsonProperty(value = "workflowId")
     private String workflowId;
 
+    /** Creates an instance of ActionResponseProperties class. */
+    public ActionResponseProperties() {
+    }
+
     /**
      * Get the workflowId property: The name of the logic app's workflow.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActivityEntityQueriesProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActivityEntityQueriesProperties.java
index e3017231f55d..799215801a2e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActivityEntityQueriesProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActivityEntityQueriesProperties.java
@@ -83,6 +83,10 @@ public final class ActivityEntityQueriesProperties {
     @JsonProperty(value = "lastModifiedTimeUtc", access = JsonProperty.Access.WRITE_ONLY)
     private OffsetDateTime lastModifiedTimeUtc;
 
+    /** Creates an instance of ActivityEntityQueriesProperties class. */
+    public ActivityEntityQueriesProperties() {
+    }
+
     /**
      * Get the title property: The entity query title.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActivityEntityQueryTemplateProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActivityEntityQueryTemplateProperties.java
index f8483ae549dc..e96290857c27 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActivityEntityQueryTemplateProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ActivityEntityQueryTemplateProperties.java
@@ -65,6 +65,10 @@ public final class ActivityEntityQueryTemplateProperties {
     @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, List<String>> entitiesFilter;
 
+    /** Creates an instance of ActivityEntityQueryTemplateProperties class. */
+    public ActivityEntityQueryTemplateProperties() {
+    }
+
     /**
      * Get the title property: The entity query title.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AlertRuleInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AlertRuleInner.java
index f3346f5f0a50..8f143205727b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AlertRuleInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AlertRuleInner.java
@@ -35,6 +35,10 @@
 })
 @Fluent
 public class AlertRuleInner extends ResourceWithEtag {
+    /** Creates an instance of AlertRuleInner class. */
+    public AlertRuleInner() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public AlertRuleInner withEtag(String etag) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AlertRuleTemplateInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AlertRuleTemplateInner.java
index a3b8dba66899..5c551acf76bb 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AlertRuleTemplateInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AlertRuleTemplateInner.java
@@ -43,6 +43,10 @@ public class AlertRuleTemplateInner extends ProxyResource {
     @JsonProperty(value = "systemData", access = JsonProperty.Access.WRITE_ONLY)
     private SystemData systemData;
 
+    /** Creates an instance of AlertRuleTemplateInner class. */
+    public AlertRuleTemplateInner() {
+    }
+
     /**
      * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AnomaliesSettingsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AnomaliesSettingsProperties.java
index 1dbd5f5a9d02..70189cf9a783 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AnomaliesSettingsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AnomaliesSettingsProperties.java
@@ -16,6 +16,10 @@ public final class AnomaliesSettingsProperties {
     @JsonProperty(value = "isEnabled", access = JsonProperty.Access.WRITE_ONLY)
     private Boolean isEnabled;
 
+    /** Creates an instance of AnomaliesSettingsProperties class. */
+    public AnomaliesSettingsProperties() {
+    }
+
     /**
      * Get the isEnabled property: Determines whether the setting is enable or disabled.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AnomalySecurityMLAnalyticsSettingsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AnomalySecurityMLAnalyticsSettingsProperties.java
index 039d66c00674..f78270cddf6e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AnomalySecurityMLAnalyticsSettingsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AnomalySecurityMLAnalyticsSettingsProperties.java
@@ -103,6 +103,10 @@ public final class AnomalySecurityMLAnalyticsSettingsProperties {
     @JsonProperty(value = "settingsDefinitionId")
     private UUID settingsDefinitionId;
 
+    /** Creates an instance of AnomalySecurityMLAnalyticsSettingsProperties class. */
+    public AnomalySecurityMLAnalyticsSettingsProperties() {
+    }
+
     /**
      * Get the description property: The description of the SecurityMLAnalyticsSettings.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ApiPollingParameters.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ApiPollingParameters.java
index 4e31c9709d7d..3a37df572e0d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ApiPollingParameters.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ApiPollingParameters.java
@@ -24,6 +24,10 @@ public final class ApiPollingParameters {
     @JsonProperty(value = "pollingConfig")
     private CodelessConnectorPollingConfigProperties pollingConfig;
 
+    /** Creates an instance of ApiPollingParameters class. */
+    public ApiPollingParameters() {
+    }
+
     /**
      * Get the connectorUiConfig property: Config to describe the instructions blade.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AscCheckRequirementsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AscCheckRequirementsProperties.java
index c7755a357b32..1e2d07858049 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AscCheckRequirementsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AscCheckRequirementsProperties.java
@@ -16,6 +16,10 @@ public final class AscCheckRequirementsProperties {
     @JsonProperty(value = "subscriptionId")
     private String subscriptionId;
 
+    /** Creates an instance of AscCheckRequirementsProperties class. */
+    public AscCheckRequirementsProperties() {
+    }
+
     /**
      * Get the subscriptionId property: The subscription id to connect to, and get the data from.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AscDataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AscDataConnectorProperties.java
index 486d75131f91..51c71ec827fa 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AscDataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AscDataConnectorProperties.java
@@ -18,6 +18,10 @@ public final class AscDataConnectorProperties extends DataConnectorWithAlertsPro
     @JsonProperty(value = "subscriptionId")
     private String subscriptionId;
 
+    /** Creates an instance of AscDataConnectorProperties class. */
+    public AscDataConnectorProperties() {
+    }
+
     /**
      * Get the subscriptionId property: The subscription id to connect to, and get the data from.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AutomationRuleInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AutomationRuleInner.java
index 1880bf1f167c..0523e36cd73d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AutomationRuleInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AutomationRuleInner.java
@@ -23,6 +23,10 @@ public final class AutomationRuleInner extends ResourceWithEtag {
     @JsonProperty(value = "properties", required = true)
     private AutomationRuleProperties innerProperties = new AutomationRuleProperties();
 
+    /** Creates an instance of AutomationRuleInner class. */
+    public AutomationRuleInner() {
+    }
+
     /**
      * Get the innerProperties property: Automation rule properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AutomationRuleProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AutomationRuleProperties.java
index 7208c57ed3b7..85363dedd380 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AutomationRuleProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AutomationRuleProperties.java
@@ -64,6 +64,10 @@ public final class AutomationRuleProperties {
     @JsonProperty(value = "createdBy", access = JsonProperty.Access.WRITE_ONLY)
     private ClientInfo createdBy;
 
+    /** Creates an instance of AutomationRuleProperties class. */
+    public AutomationRuleProperties() {
+    }
+
     /**
      * Get the displayName property: The display name of the automation rule.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AwsCloudTrailDataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AwsCloudTrailDataConnectorProperties.java
index 49ef9cc2defa..48fee1f98959 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AwsCloudTrailDataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AwsCloudTrailDataConnectorProperties.java
@@ -24,6 +24,10 @@ public final class AwsCloudTrailDataConnectorProperties {
     @JsonProperty(value = "dataTypes", required = true)
     private AwsCloudTrailDataConnectorDataTypes dataTypes;
 
+    /** Creates an instance of AwsCloudTrailDataConnectorProperties class. */
+    public AwsCloudTrailDataConnectorProperties() {
+    }
+
     /**
      * Get the awsRoleArn property: The Aws Role Arn (with CloudTrailReadOnly policy) that is used to access the Aws
      * account.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AwsS3DataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AwsS3DataConnectorProperties.java
index fb81e27a8457..c5910740e897 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AwsS3DataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AwsS3DataConnectorProperties.java
@@ -37,6 +37,10 @@ public final class AwsS3DataConnectorProperties {
     @JsonProperty(value = "dataTypes", required = true)
     private AwsS3DataConnectorDataTypes dataTypes;
 
+    /** Creates an instance of AwsS3DataConnectorProperties class. */
+    public AwsS3DataConnectorProperties() {
+    }
+
     /**
      * Get the destinationTable property: The logs destination table name in LogAnalytics.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AzureResourceEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AzureResourceEntityProperties.java
index e73dcc2482d4..6fe113c9c158 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AzureResourceEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/AzureResourceEntityProperties.java
@@ -23,6 +23,10 @@ public final class AzureResourceEntityProperties extends EntityCommonProperties
     @JsonProperty(value = "subscriptionId", access = JsonProperty.Access.WRITE_ONLY)
     private String subscriptionId;
 
+    /** Creates an instance of AzureResourceEntityProperties class. */
+    public AzureResourceEntityProperties() {
+    }
+
     /**
      * Get the resourceId property: The azure resource id of the resource.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/BookmarkExpandResponseInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/BookmarkExpandResponseInner.java
index 24e6c6ae3a87..625cdd6aade5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/BookmarkExpandResponseInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/BookmarkExpandResponseInner.java
@@ -24,6 +24,10 @@ public final class BookmarkExpandResponseInner {
     @JsonProperty(value = "value")
     private BookmarkExpandResponseValue value;
 
+    /** Creates an instance of BookmarkExpandResponseInner class. */
+    public BookmarkExpandResponseInner() {
+    }
+
     /**
      * Get the metadata property: The metadata from the expansion operation results.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/BookmarkInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/BookmarkInner.java
index 5d04c419ecc5..994355b88b8f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/BookmarkInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/BookmarkInner.java
@@ -23,6 +23,10 @@ public final class BookmarkInner extends ResourceWithEtag {
     @JsonProperty(value = "properties")
     private BookmarkProperties innerProperties;
 
+    /** Creates an instance of BookmarkInner class. */
+    public BookmarkInner() {
+    }
+
     /**
      * Get the innerProperties property: Bookmark properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/BookmarkProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/BookmarkProperties.java
index 44be7d59238a..2436eecd6343 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/BookmarkProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/BookmarkProperties.java
@@ -113,6 +113,10 @@ public final class BookmarkProperties {
     @JsonProperty(value = "techniques")
     private List<String> techniques;
 
+    /** Creates an instance of BookmarkProperties class. */
+    public BookmarkProperties() {
+    }
+
     /**
      * Get the created property: The time the bookmark was created.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/CloudApplicationEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/CloudApplicationEntityProperties.java
index 3b8a4b7b7a4e..0a73580c561b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/CloudApplicationEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/CloudApplicationEntityProperties.java
@@ -30,6 +30,10 @@ public final class CloudApplicationEntityProperties extends EntityCommonProperti
     @JsonProperty(value = "instanceName", access = JsonProperty.Access.WRITE_ONLY)
     private String instanceName;
 
+    /** Creates an instance of CloudApplicationEntityProperties class. */
+    public CloudApplicationEntityProperties() {
+    }
+
     /**
      * Get the appId property: The technical identifier of the application.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/CodelessParameters.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/CodelessParameters.java
index ec2fa5baa272..2cf1829de01b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/CodelessParameters.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/CodelessParameters.java
@@ -17,6 +17,10 @@ public final class CodelessParameters {
     @JsonProperty(value = "connectorUiConfig")
     private CodelessUiConnectorConfigProperties connectorUiConfig;
 
+    /** Creates an instance of CodelessParameters class. */
+    public CodelessParameters() {
+    }
+
     /**
      * Get the connectorUiConfig property: Config to describe the instructions blade.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/DataConnectorInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/DataConnectorInner.java
index cfec062d1609..989214b07a43 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/DataConnectorInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/DataConnectorInner.java
@@ -61,6 +61,10 @@
 })
 @Fluent
 public class DataConnectorInner extends ResourceWithEtag {
+    /** Creates an instance of DataConnectorInner class. */
+    public DataConnectorInner() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public DataConnectorInner withEtag(String etag) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/DataConnectorRequirementsStateInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/DataConnectorRequirementsStateInner.java
index 6fde14a69e47..b99c5fd6bd29 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/DataConnectorRequirementsStateInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/DataConnectorRequirementsStateInner.java
@@ -24,6 +24,10 @@ public final class DataConnectorRequirementsStateInner {
     @JsonProperty(value = "licenseState")
     private DataConnectorLicenseState licenseState;
 
+    /** Creates an instance of DataConnectorRequirementsStateInner class. */
+    public DataConnectorRequirementsStateInner() {
+    }
+
     /**
      * Get the authorizationState property: Authorization state for this connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/DnsEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/DnsEntityProperties.java
index 5565c6456bf3..b197548705d5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/DnsEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/DnsEntityProperties.java
@@ -36,6 +36,10 @@ public final class DnsEntityProperties extends EntityCommonProperties {
     @JsonProperty(value = "ipAddressEntityIds", access = JsonProperty.Access.WRITE_ONLY)
     private List<String> ipAddressEntityIds;
 
+    /** Creates an instance of DnsEntityProperties class. */
+    public DnsEntityProperties() {
+    }
+
     /**
      * Get the dnsServerIpEntityId property: An ip entity id for the dns server resolving the request.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/Dynamics365CheckRequirementsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/Dynamics365CheckRequirementsProperties.java
index e88e1fce95ed..9e374b9155e9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/Dynamics365CheckRequirementsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/Dynamics365CheckRequirementsProperties.java
@@ -10,6 +10,10 @@
 /** Dynamics365 requirements check properties. */
 @Fluent
 public final class Dynamics365CheckRequirementsProperties extends DataConnectorTenantId {
+    /** Creates an instance of Dynamics365CheckRequirementsProperties class. */
+    public Dynamics365CheckRequirementsProperties() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public Dynamics365CheckRequirementsProperties withTenantId(String tenantId) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/Dynamics365DataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/Dynamics365DataConnectorProperties.java
index bde2773bc7c9..250a414e49c6 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/Dynamics365DataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/Dynamics365DataConnectorProperties.java
@@ -19,6 +19,10 @@ public final class Dynamics365DataConnectorProperties extends DataConnectorTenan
     @JsonProperty(value = "dataTypes", required = true)
     private Dynamics365DataConnectorDataTypes dataTypes;
 
+    /** Creates an instance of Dynamics365DataConnectorProperties class. */
+    public Dynamics365DataConnectorProperties() {
+    }
+
     /**
      * Get the dataTypes property: The available data types for the connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EnrichmentDomainWhoisInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EnrichmentDomainWhoisInner.java
index 17b9864df9bb..7f9cebb082e4 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EnrichmentDomainWhoisInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EnrichmentDomainWhoisInner.java
@@ -48,6 +48,10 @@ public final class EnrichmentDomainWhoisInner {
     @JsonProperty(value = "parsedWhois")
     private EnrichmentDomainWhoisDetails parsedWhois;
 
+    /** Creates an instance of EnrichmentDomainWhoisInner class. */
+    public EnrichmentDomainWhoisInner() {
+    }
+
     /**
      * Get the domain property: The domain for this whois record.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EnrichmentIpGeodataInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EnrichmentIpGeodataInner.java
index 8fc05f9c066a..19bf540c2cc9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EnrichmentIpGeodataInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EnrichmentIpGeodataInner.java
@@ -112,6 +112,10 @@ public final class EnrichmentIpGeodataInner {
     @JsonProperty(value = "stateCode")
     private String stateCode;
 
+    /** Creates an instance of EnrichmentIpGeodataInner class. */
+    public EnrichmentIpGeodataInner() {
+    }
+
     /**
      * Get the asn property: The autonomous system number associated with this IP address.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityAnalyticsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityAnalyticsProperties.java
index 286aa9d87ccc..4b4404e2ce9c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityAnalyticsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityAnalyticsProperties.java
@@ -18,6 +18,10 @@ public final class EntityAnalyticsProperties {
     @JsonProperty(value = "entityProviders")
     private List<EntityProviders> entityProviders;
 
+    /** Creates an instance of EntityAnalyticsProperties class. */
+    public EntityAnalyticsProperties() {
+    }
+
     /**
      * Get the entityProviders property: The relevant entity providers that are synced.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityExpandResponseInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityExpandResponseInner.java
index 1526fff102b4..29ad5815e1d4 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityExpandResponseInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityExpandResponseInner.java
@@ -24,6 +24,10 @@ public final class EntityExpandResponseInner {
     @JsonProperty(value = "value")
     private EntityExpandResponseValue value;
 
+    /** Creates an instance of EntityExpandResponseInner class. */
+    public EntityExpandResponseInner() {
+    }
+
     /**
      * Get the metadata property: The metadata from the expansion operation results.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityGetInsightsResponseInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityGetInsightsResponseInner.java
index 0b2543093f8e..01e887ab5e84 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityGetInsightsResponseInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityGetInsightsResponseInner.java
@@ -25,6 +25,10 @@ public final class EntityGetInsightsResponseInner {
     @JsonProperty(value = "value")
     private List<EntityInsightItem> value;
 
+    /** Creates an instance of EntityGetInsightsResponseInner class. */
+    public EntityGetInsightsResponseInner() {
+    }
+
     /**
      * Get the metadata property: The metadata from the get insights operation results.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityInner.java
index f829a29d3b07..e4e1cd75d704 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityInner.java
@@ -73,6 +73,10 @@ public class EntityInner extends ProxyResource {
     @JsonProperty(value = "systemData", access = JsonProperty.Access.WRITE_ONLY)
     private SystemData systemData;
 
+    /** Creates an instance of EntityInner class. */
+    public EntityInner() {
+    }
+
     /**
      * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityQueryInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityQueryInner.java
index f1bdc7049f0e..7c1dd21af080 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityQueryInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityQueryInner.java
@@ -25,6 +25,10 @@
 })
 @Fluent
 public class EntityQueryInner extends ResourceWithEtag {
+    /** Creates an instance of EntityQueryInner class. */
+    public EntityQueryInner() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public EntityQueryInner withEtag(String etag) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityQueryTemplateInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityQueryTemplateInner.java
index b0d7b460f1ae..ffaa9e8e9c8b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityQueryTemplateInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityQueryTemplateInner.java
@@ -29,6 +29,10 @@ public class EntityQueryTemplateInner extends ProxyResource {
     @JsonProperty(value = "systemData", access = JsonProperty.Access.WRITE_ONLY)
     private SystemData systemData;
 
+    /** Creates an instance of EntityQueryTemplateInner class. */
+    public EntityQueryTemplateInner() {
+    }
+
     /**
      * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityTimelineResponseInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityTimelineResponseInner.java
index 14d25888dac9..49d0fde3c2c1 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityTimelineResponseInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EntityTimelineResponseInner.java
@@ -25,6 +25,10 @@ public final class EntityTimelineResponseInner {
     @JsonProperty(value = "value")
     private List<EntityTimelineItem> value;
 
+    /** Creates an instance of EntityTimelineResponseInner class. */
+    public EntityTimelineResponseInner() {
+    }
+
     /**
      * Get the metadata property: The metadata from the timeline operation results.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ExpansionEntityQueriesProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ExpansionEntityQueriesProperties.java
index 5f1ff9e9d6f5..2aa172898641 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ExpansionEntityQueriesProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ExpansionEntityQueriesProperties.java
@@ -48,6 +48,10 @@ public final class ExpansionEntityQueriesProperties {
     @JsonProperty(value = "queryTemplate")
     private String queryTemplate;
 
+    /** Creates an instance of ExpansionEntityQueriesProperties class. */
+    public ExpansionEntityQueriesProperties() {
+    }
+
     /**
      * Get the dataSources property: List of the data sources that are required to run the query.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EyesOnSettingsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EyesOnSettingsProperties.java
index 90e3adfec3d7..9c2629cc652c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EyesOnSettingsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/EyesOnSettingsProperties.java
@@ -16,6 +16,10 @@ public final class EyesOnSettingsProperties {
     @JsonProperty(value = "isEnabled", access = JsonProperty.Access.WRITE_ONLY)
     private Boolean isEnabled;
 
+    /** Creates an instance of EyesOnSettingsProperties class. */
+    public EyesOnSettingsProperties() {
+    }
+
     /**
      * Get the isEnabled property: Determines whether the setting is enable or disabled.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FileEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FileEntityProperties.java
index 7588902fa603..9fc1d12ab5d5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FileEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FileEntityProperties.java
@@ -36,6 +36,10 @@ public final class FileEntityProperties extends EntityCommonProperties {
     @JsonProperty(value = "hostEntityId", access = JsonProperty.Access.WRITE_ONLY)
     private String hostEntityId;
 
+    /** Creates an instance of FileEntityProperties class. */
+    public FileEntityProperties() {
+    }
+
     /**
      * Get the directory property: The full path to the file.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FileHashEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FileHashEntityProperties.java
index 8ebadc287860..aeb52c51f490 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FileHashEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FileHashEntityProperties.java
@@ -24,6 +24,10 @@ public final class FileHashEntityProperties extends EntityCommonProperties {
     @JsonProperty(value = "hashValue", access = JsonProperty.Access.WRITE_ONLY)
     private String hashValue;
 
+    /** Creates an instance of FileHashEntityProperties class. */
+    public FileHashEntityProperties() {
+    }
+
     /**
      * Get the algorithm property: The hash algorithm type.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FileImportInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FileImportInner.java
index fe47f14b590c..f74e253ce149 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FileImportInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FileImportInner.java
@@ -31,6 +31,10 @@ public final class FileImportInner extends ProxyResource {
     @JsonProperty(value = "systemData", access = JsonProperty.Access.WRITE_ONLY)
     private SystemData systemData;
 
+    /** Creates an instance of FileImportInner class. */
+    public FileImportInner() {
+    }
+
     /**
      * Get the innerProperties property: File import properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FileImportProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FileImportProperties.java
index 1ae17de2e493..36ec96e9f4fc 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FileImportProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FileImportProperties.java
@@ -96,6 +96,10 @@ public final class FileImportProperties {
     @JsonProperty(value = "importValidUntilTimeUTC", access = JsonProperty.Access.WRITE_ONLY)
     private OffsetDateTime importValidUntilTimeUtc;
 
+    /** Creates an instance of FileImportProperties class. */
+    public FileImportProperties() {
+    }
+
     /**
      * Get the ingestionMode property: Describes how to ingest the records in the file.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FusionAlertRuleProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FusionAlertRuleProperties.java
index 3ce589c95ac6..cb5aa5599a7e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FusionAlertRuleProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FusionAlertRuleProperties.java
@@ -77,6 +77,10 @@ public final class FusionAlertRuleProperties {
     @JsonProperty(value = "techniques", access = JsonProperty.Access.WRITE_ONLY)
     private List<String> techniques;
 
+    /** Creates an instance of FusionAlertRuleProperties class. */
+    public FusionAlertRuleProperties() {
+    }
+
     /**
      * Get the alertRuleTemplateName property: The Name of the alert rule template used to create this rule.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FusionAlertRuleTemplateProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FusionAlertRuleTemplateProperties.java
index 162717edb32f..a6d980efc93e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FusionAlertRuleTemplateProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/FusionAlertRuleTemplateProperties.java
@@ -83,6 +83,10 @@ public final class FusionAlertRuleTemplateProperties {
     @JsonProperty(value = "sourceSettings")
     private List<FusionTemplateSourceSetting> sourceSettings;
 
+    /** Creates an instance of FusionAlertRuleTemplateProperties class. */
+    public FusionAlertRuleTemplateProperties() {
+    }
+
     /**
      * Get the alertRulesCreatedByTemplateCount property: the number of alert rules that were created by this template.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/GetQueriesResponseInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/GetQueriesResponseInner.java
index d001a56c976d..24162b32c41b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/GetQueriesResponseInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/GetQueriesResponseInner.java
@@ -18,6 +18,10 @@ public final class GetQueriesResponseInner {
     @JsonProperty(value = "value")
     private List<EntityQueryItem> value;
 
+    /** Creates an instance of GetQueriesResponseInner class. */
+    public GetQueriesResponseInner() {
+    }
+
     /**
      * Get the value property: The query result values.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/HostEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/HostEntityProperties.java
index 16f676846108..7e8f10cbaac0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/HostEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/HostEntityProperties.java
@@ -67,6 +67,10 @@ public final class HostEntityProperties extends EntityCommonProperties {
     @JsonProperty(value = "osVersion", access = JsonProperty.Access.WRITE_ONLY)
     private String osVersion;
 
+    /** Creates an instance of HostEntityProperties class. */
+    public HostEntityProperties() {
+    }
+
     /**
      * Get the azureId property: The azure resource id of the VM.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/HuntingBookmarkProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/HuntingBookmarkProperties.java
index 5be6c7dc4e9b..52b6ecb24516 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/HuntingBookmarkProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/HuntingBookmarkProperties.java
@@ -82,6 +82,10 @@ public final class HuntingBookmarkProperties extends EntityCommonProperties {
     @JsonProperty(value = "incidentInfo")
     private IncidentInfo incidentInfo;
 
+    /** Creates an instance of HuntingBookmarkProperties class. */
+    public HuntingBookmarkProperties() {
+    }
+
     /**
      * Get the created property: The time the bookmark was created.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentAlertListInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentAlertListInner.java
index 18459e1b4f13..c5e7f0834b7d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentAlertListInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentAlertListInner.java
@@ -19,6 +19,10 @@ public final class IncidentAlertListInner {
     @JsonProperty(value = "value", required = true)
     private List<SecurityAlert> value;
 
+    /** Creates an instance of IncidentAlertListInner class. */
+    public IncidentAlertListInner() {
+    }
+
     /**
      * Get the value property: Array of incident alerts.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentBookmarkListInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentBookmarkListInner.java
index aa6aec92f588..e313e259db7a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentBookmarkListInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentBookmarkListInner.java
@@ -19,6 +19,10 @@ public final class IncidentBookmarkListInner {
     @JsonProperty(value = "value", required = true)
     private List<HuntingBookmark> value;
 
+    /** Creates an instance of IncidentBookmarkListInner class. */
+    public IncidentBookmarkListInner() {
+    }
+
     /**
      * Get the value property: Array of incident bookmarks.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentCommentInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentCommentInner.java
index 5bde60b473fa..04ef33791fa8 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentCommentInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentCommentInner.java
@@ -19,6 +19,10 @@ public final class IncidentCommentInner extends ResourceWithEtag {
     @JsonProperty(value = "properties")
     private IncidentCommentProperties innerProperties;
 
+    /** Creates an instance of IncidentCommentInner class. */
+    public IncidentCommentInner() {
+    }
+
     /**
      * Get the innerProperties property: Incident comment properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentCommentProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentCommentProperties.java
index 6cc4d172a5e2..35379f0b4aa3 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentCommentProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentCommentProperties.java
@@ -37,6 +37,10 @@ public final class IncidentCommentProperties {
     @JsonProperty(value = "author", access = JsonProperty.Access.WRITE_ONLY)
     private ClientInfo author;
 
+    /** Creates an instance of IncidentCommentProperties class. */
+    public IncidentCommentProperties() {
+    }
+
     /**
      * Get the createdTimeUtc property: The time the comment was created.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentEntitiesResponseInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentEntitiesResponseInner.java
index 3f6dbe089b16..60024736964d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentEntitiesResponseInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentEntitiesResponseInner.java
@@ -24,6 +24,10 @@ public final class IncidentEntitiesResponseInner {
     @JsonProperty(value = "metaData")
     private List<IncidentEntitiesResultsMetadata> metadata;
 
+    /** Creates an instance of IncidentEntitiesResponseInner class. */
+    public IncidentEntitiesResponseInner() {
+    }
+
     /**
      * Get the entities property: Array of the incident related entities.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentInner.java
index 7f44360a2ebd..c852a7bfee4a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentInner.java
@@ -26,6 +26,10 @@ public final class IncidentInner extends ResourceWithEtag {
     @JsonProperty(value = "properties")
     private IncidentPropertiesInner innerProperties;
 
+    /** Creates an instance of IncidentInner class. */
+    public IncidentInner() {
+    }
+
     /**
      * Get the innerProperties property: Incident properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentPropertiesInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentPropertiesInner.java
index 5262e2c3ba58..b82f5f578d86 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentPropertiesInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IncidentPropertiesInner.java
@@ -140,6 +140,10 @@ public final class IncidentPropertiesInner {
     @JsonProperty(value = "title", required = true)
     private String title;
 
+    /** Creates an instance of IncidentPropertiesInner class. */
+    public IncidentPropertiesInner() {
+    }
+
     /**
      * Get the additionalData property: Additional data on the incident.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IoTCheckRequirementsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IoTCheckRequirementsProperties.java
index 63643c5077a2..6a51d0a15ac7 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IoTCheckRequirementsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IoTCheckRequirementsProperties.java
@@ -16,6 +16,10 @@ public final class IoTCheckRequirementsProperties {
     @JsonProperty(value = "subscriptionId")
     private String subscriptionId;
 
+    /** Creates an instance of IoTCheckRequirementsProperties class. */
+    public IoTCheckRequirementsProperties() {
+    }
+
     /**
      * Get the subscriptionId property: The subscription id to connect to, and get the data from.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IoTDataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IoTDataConnectorProperties.java
index 1917add910f9..8eba9f642ee3 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IoTDataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IoTDataConnectorProperties.java
@@ -18,6 +18,10 @@ public final class IoTDataConnectorProperties extends DataConnectorWithAlertsPro
     @JsonProperty(value = "subscriptionId")
     private String subscriptionId;
 
+    /** Creates an instance of IoTDataConnectorProperties class. */
+    public IoTDataConnectorProperties() {
+    }
+
     /**
      * Get the subscriptionId property: The subscription id to connect to, and get the data from.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IoTDeviceEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IoTDeviceEntityProperties.java
index 971f9f13da46..8318c4f857b1 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IoTDeviceEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IoTDeviceEntityProperties.java
@@ -183,6 +183,10 @@ public final class IoTDeviceEntityProperties extends EntityCommonProperties {
     @JsonProperty(value = "isScanner", access = JsonProperty.Access.WRITE_ONLY)
     private Boolean isScanner;
 
+    /** Creates an instance of IoTDeviceEntityProperties class. */
+    public IoTDeviceEntityProperties() {
+    }
+
     /**
      * Get the deviceId property: The ID of the IoT Device in the IoT Hub.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IpEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IpEntityProperties.java
index fa6b07dd783f..0a9b814b6a3c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IpEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/IpEntityProperties.java
@@ -32,6 +32,10 @@ public final class IpEntityProperties extends EntityCommonProperties {
     @JsonProperty(value = "threatIntelligence", access = JsonProperty.Access.WRITE_ONLY)
     private List<ThreatIntelligence> threatIntelligence;
 
+    /** Creates an instance of IpEntityProperties class. */
+    public IpEntityProperties() {
+    }
+
     /**
      * Get the address property: The IP address as string, e.g. 127.0.0.1 (either in Ipv4 or Ipv6).
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MLBehaviorAnalyticsAlertRuleProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MLBehaviorAnalyticsAlertRuleProperties.java
index 423fdf2974b6..6e93e2edaaee 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MLBehaviorAnalyticsAlertRuleProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MLBehaviorAnalyticsAlertRuleProperties.java
@@ -63,6 +63,10 @@ public final class MLBehaviorAnalyticsAlertRuleProperties {
     @JsonProperty(value = "techniques", access = JsonProperty.Access.WRITE_ONLY)
     private List<String> techniques;
 
+    /** Creates an instance of MLBehaviorAnalyticsAlertRuleProperties class. */
+    public MLBehaviorAnalyticsAlertRuleProperties() {
+    }
+
     /**
      * Get the alertRuleTemplateName property: The Name of the alert rule template used to create this rule.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MLBehaviorAnalyticsAlertRuleTemplateProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MLBehaviorAnalyticsAlertRuleTemplateProperties.java
index c048baca3053..f9703e6e8eb9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MLBehaviorAnalyticsAlertRuleTemplateProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MLBehaviorAnalyticsAlertRuleTemplateProperties.java
@@ -23,6 +23,10 @@ public final class MLBehaviorAnalyticsAlertRuleTemplateProperties extends AlertR
     @JsonProperty(value = "severity", required = true)
     private AlertSeverity severity;
 
+    /** Creates an instance of MLBehaviorAnalyticsAlertRuleTemplateProperties class. */
+    public MLBehaviorAnalyticsAlertRuleTemplateProperties() {
+    }
+
     /**
      * Get the severity property: The severity for alerts created by this alert rule.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MailClusterEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MailClusterEntityProperties.java
index 62c3cc3aec6a..b523b9c536eb 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MailClusterEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MailClusterEntityProperties.java
@@ -103,6 +103,10 @@ public final class MailClusterEntityProperties extends EntityCommonProperties {
     @JsonProperty(value = "clusterGroup", access = JsonProperty.Access.WRITE_ONLY)
     private String clusterGroup;
 
+    /** Creates an instance of MailClusterEntityProperties class. */
+    public MailClusterEntityProperties() {
+    }
+
     /**
      * Get the networkMessageIds property: The mail message IDs that are part of the mail cluster.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MailMessageEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MailMessageEntityProperties.java
index e2d92d2606a6..9d3fb6ad8c86 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MailMessageEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MailMessageEntityProperties.java
@@ -168,6 +168,10 @@ public final class MailMessageEntityProperties extends EntityCommonProperties {
     @JsonProperty(value = "deliveryLocation")
     private DeliveryLocation deliveryLocation;
 
+    /** Creates an instance of MailMessageEntityProperties class. */
+    public MailMessageEntityProperties() {
+    }
+
     /**
      * Get the fileEntityIds property: The File entity ids of this mail message's attachments.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MailboxEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MailboxEntityProperties.java
index c0ec6c6fdaee..efc2be76821b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MailboxEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MailboxEntityProperties.java
@@ -37,6 +37,10 @@ public final class MailboxEntityProperties extends EntityCommonProperties {
     @JsonProperty(value = "externalDirectoryObjectId", access = JsonProperty.Access.WRITE_ONLY)
     private UUID externalDirectoryObjectId;
 
+    /** Creates an instance of MailboxEntityProperties class. */
+    public MailboxEntityProperties() {
+    }
+
     /**
      * Get the mailboxPrimaryAddress property: The mailbox's primary address.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MalwareEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MalwareEntityProperties.java
index ded00f33417f..847174346dd7 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MalwareEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MalwareEntityProperties.java
@@ -36,6 +36,10 @@ public final class MalwareEntityProperties extends EntityCommonProperties {
     @JsonProperty(value = "processEntityIds", access = JsonProperty.Access.WRITE_ONLY)
     private List<String> processEntityIds;
 
+    /** Creates an instance of MalwareEntityProperties class. */
+    public MalwareEntityProperties() {
+    }
+
     /**
      * Get the category property: The malware category by the vendor, e.g. Trojan.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/McasCheckRequirementsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/McasCheckRequirementsProperties.java
index 529764ae709a..9e35ce58e22c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/McasCheckRequirementsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/McasCheckRequirementsProperties.java
@@ -10,6 +10,10 @@
 /** MCAS (Microsoft Cloud App Security) requirements check properties. */
 @Fluent
 public final class McasCheckRequirementsProperties extends DataConnectorTenantId {
+    /** Creates an instance of McasCheckRequirementsProperties class. */
+    public McasCheckRequirementsProperties() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public McasCheckRequirementsProperties withTenantId(String tenantId) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/McasDataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/McasDataConnectorProperties.java
index 38068dd10782..c33416cc576c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/McasDataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/McasDataConnectorProperties.java
@@ -19,6 +19,10 @@ public final class McasDataConnectorProperties extends DataConnectorTenantId {
     @JsonProperty(value = "dataTypes", required = true)
     private McasDataConnectorDataTypes dataTypes;
 
+    /** Creates an instance of McasDataConnectorProperties class. */
+    public McasDataConnectorProperties() {
+    }
+
     /**
      * Get the dataTypes property: The available data types for the connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MdatpCheckRequirementsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MdatpCheckRequirementsProperties.java
index 789441efbf97..ed965d8ada06 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MdatpCheckRequirementsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MdatpCheckRequirementsProperties.java
@@ -10,6 +10,10 @@
 /** MDATP (Microsoft Defender Advanced Threat Protection) requirements check properties. */
 @Fluent
 public final class MdatpCheckRequirementsProperties extends DataConnectorTenantId {
+    /** Creates an instance of MdatpCheckRequirementsProperties class. */
+    public MdatpCheckRequirementsProperties() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public MdatpCheckRequirementsProperties withTenantId(String tenantId) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MdatpDataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MdatpDataConnectorProperties.java
index a1466e451fb0..20d29e00d16c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MdatpDataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MdatpDataConnectorProperties.java
@@ -18,6 +18,10 @@ public final class MdatpDataConnectorProperties extends DataConnectorTenantId {
     @JsonProperty(value = "dataTypes")
     private AlertsDataTypeOfDataConnector dataTypes;
 
+    /** Creates an instance of MdatpDataConnectorProperties class. */
+    public MdatpDataConnectorProperties() {
+    }
+
     /**
      * Get the dataTypes property: The available data types for the connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MetadataModelInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MetadataModelInner.java
index 25c3b5166242..4b0e1ecc59d3 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MetadataModelInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MetadataModelInner.java
@@ -25,6 +25,10 @@ public final class MetadataModelInner extends ResourceWithEtag {
     @JsonProperty(value = "properties")
     private MetadataProperties innerProperties;
 
+    /** Creates an instance of MetadataModelInner class. */
+    public MetadataModelInner() {
+    }
+
     /**
      * Get the innerProperties property: Metadata properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MetadataProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MetadataProperties.java
index 3fed7e25da81..e36fcc5997b8 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MetadataProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MetadataProperties.java
@@ -138,6 +138,10 @@ public final class MetadataProperties {
     @JsonProperty(value = "previewImagesDark")
     private List<String> previewImagesDark;
 
+    /** Creates an instance of MetadataProperties class. */
+    public MetadataProperties() {
+    }
+
     /**
      * Get the contentId property: Static ID for the content. Used to identify dependencies and content from solutions
      * or community. Hard-coded/static for out of the box content and solutions. Dynamic for user-created. This is the
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MetadataPropertiesPatch.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MetadataPropertiesPatch.java
index 470f6f2cb684..3b76ce19bdaa 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MetadataPropertiesPatch.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MetadataPropertiesPatch.java
@@ -137,6 +137,10 @@ public final class MetadataPropertiesPatch {
     @JsonProperty(value = "previewImagesDark")
     private List<String> previewImagesDark;
 
+    /** Creates an instance of MetadataPropertiesPatch class. */
+    public MetadataPropertiesPatch() {
+    }
+
     /**
      * Get the contentId property: Static ID for the content. Used to identify dependencies and content from solutions
      * or community. Hard-coded/static for out of the box content and solutions. Dynamic for user-created. This is the
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MicrosoftSecurityIncidentCreationAlertRuleProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MicrosoftSecurityIncidentCreationAlertRuleProperties.java
index 6c482ad3565a..70a8a6b6897e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MicrosoftSecurityIncidentCreationAlertRuleProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MicrosoftSecurityIncidentCreationAlertRuleProperties.java
@@ -47,6 +47,10 @@ public final class MicrosoftSecurityIncidentCreationAlertRuleProperties
     @JsonProperty(value = "lastModifiedUtc", access = JsonProperty.Access.WRITE_ONLY)
     private OffsetDateTime lastModifiedUtc;
 
+    /** Creates an instance of MicrosoftSecurityIncidentCreationAlertRuleProperties class. */
+    public MicrosoftSecurityIncidentCreationAlertRuleProperties() {
+    }
+
     /**
      * Get the alertRuleTemplateName property: The Name of the alert rule template used to create this rule.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MicrosoftSecurityIncidentCreationAlertRuleTemplateProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MicrosoftSecurityIncidentCreationAlertRuleTemplateProperties.java
index d5732a0625a0..5809693c8da9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MicrosoftSecurityIncidentCreationAlertRuleTemplateProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MicrosoftSecurityIncidentCreationAlertRuleTemplateProperties.java
@@ -41,6 +41,10 @@ public final class MicrosoftSecurityIncidentCreationAlertRuleTemplateProperties
     @JsonProperty(value = "severitiesFilter")
     private List<AlertSeverity> severitiesFilter;
 
+    /** Creates an instance of MicrosoftSecurityIncidentCreationAlertRuleTemplateProperties class. */
+    public MicrosoftSecurityIncidentCreationAlertRuleTemplateProperties() {
+    }
+
     /**
      * Get the displayNamesFilter property: the alerts' displayNames on which the cases will be generated.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MstiCheckRequirementsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MstiCheckRequirementsProperties.java
index 6688b38be2fb..c02f86f98592 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MstiCheckRequirementsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MstiCheckRequirementsProperties.java
@@ -10,6 +10,10 @@
 /** Microsoft Threat Intelligence requirements check properties. */
 @Fluent
 public final class MstiCheckRequirementsProperties extends DataConnectorTenantId {
+    /** Creates an instance of MstiCheckRequirementsProperties class. */
+    public MstiCheckRequirementsProperties() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public MstiCheckRequirementsProperties withTenantId(String tenantId) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MstiDataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MstiDataConnectorProperties.java
index 7bef9230fe38..2aa5c866d40b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MstiDataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MstiDataConnectorProperties.java
@@ -19,6 +19,10 @@ public final class MstiDataConnectorProperties extends DataConnectorTenantId {
     @JsonProperty(value = "dataTypes", required = true)
     private MstiDataConnectorDataTypes dataTypes;
 
+    /** Creates an instance of MstiDataConnectorProperties class. */
+    public MstiDataConnectorProperties() {
+    }
+
     /**
      * Get the dataTypes property: The available data types for the connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MtpCheckRequirementsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MtpCheckRequirementsProperties.java
index 68d2ff985a20..ae34070ce30f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MtpCheckRequirementsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MtpCheckRequirementsProperties.java
@@ -10,6 +10,10 @@
 /** MTP (Microsoft Threat Protection) requirements check properties. */
 @Fluent
 public final class MtpCheckRequirementsProperties extends DataConnectorTenantId {
+    /** Creates an instance of MtpCheckRequirementsProperties class. */
+    public MtpCheckRequirementsProperties() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public MtpCheckRequirementsProperties withTenantId(String tenantId) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MtpDataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MtpDataConnectorProperties.java
index 2399f7dba165..59201b37e6f2 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MtpDataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/MtpDataConnectorProperties.java
@@ -19,6 +19,10 @@ public final class MtpDataConnectorProperties extends DataConnectorTenantId {
     @JsonProperty(value = "dataTypes", required = true)
     private MtpDataConnectorDataTypes dataTypes;
 
+    /** Creates an instance of MtpDataConnectorProperties class. */
+    public MtpDataConnectorProperties() {
+    }
+
     /**
      * Get the dataTypes property: The available data types for the connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/NicEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/NicEntityProperties.java
index 810e29f8c340..b5a36f2601a9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/NicEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/NicEntityProperties.java
@@ -30,6 +30,10 @@ public final class NicEntityProperties extends EntityCommonProperties {
     @JsonProperty(value = "vlans", access = JsonProperty.Access.WRITE_ONLY)
     private List<String> vlans;
 
+    /** Creates an instance of NicEntityProperties class. */
+    public NicEntityProperties() {
+    }
+
     /**
      * Get the macAddress property: The MAC address of this network interface.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/NrtAlertRuleProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/NrtAlertRuleProperties.java
index 2d2b3f5d6791..1b8d5b450610 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/NrtAlertRuleProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/NrtAlertRuleProperties.java
@@ -12,6 +12,7 @@
 import com.azure.resourcemanager.securityinsights.models.EntityMapping;
 import com.azure.resourcemanager.securityinsights.models.EventGroupingSettings;
 import com.azure.resourcemanager.securityinsights.models.IncidentConfiguration;
+import com.azure.resourcemanager.securityinsights.models.SentinelEntityMapping;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.time.Duration;
@@ -126,6 +127,16 @@ public final class NrtAlertRuleProperties {
     @JsonProperty(value = "eventGroupingSettings")
     private EventGroupingSettings eventGroupingSettings;
 
+    /*
+     * Array of the sentinel entity mappings of the alert rule
+     */
+    @JsonProperty(value = "sentinelEntitiesMappings")
+    private List<SentinelEntityMapping> sentinelEntitiesMappings;
+
+    /** Creates an instance of NrtAlertRuleProperties class. */
+    public NrtAlertRuleProperties() {
+    }
+
     /**
      * Get the alertRuleTemplateName property: The Name of the alert rule template used to create this rule.
      *
@@ -463,6 +474,26 @@ public NrtAlertRuleProperties withEventGroupingSettings(EventGroupingSettings ev
         return this;
     }
 
+    /**
+     * Get the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @return the sentinelEntitiesMappings value.
+     */
+    public List<SentinelEntityMapping> sentinelEntitiesMappings() {
+        return this.sentinelEntitiesMappings;
+    }
+
+    /**
+     * Set the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @param sentinelEntitiesMappings the sentinelEntitiesMappings value to set.
+     * @return the NrtAlertRuleProperties object itself.
+     */
+    public NrtAlertRuleProperties withSentinelEntitiesMappings(List<SentinelEntityMapping> sentinelEntitiesMappings) {
+        this.sentinelEntitiesMappings = sentinelEntitiesMappings;
+        return this;
+    }
+
     /**
      * Validates the instance.
      *
@@ -503,6 +534,9 @@ public void validate() {
         if (eventGroupingSettings() != null) {
             eventGroupingSettings().validate();
         }
+        if (sentinelEntitiesMappings() != null) {
+            sentinelEntitiesMappings().forEach(e -> e.validate());
+        }
     }
 
     private static final ClientLogger LOGGER = new ClientLogger(NrtAlertRuleProperties.class);
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/NrtAlertRuleTemplateProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/NrtAlertRuleTemplateProperties.java
index 97788b8fd862..2efd4e7f66ad 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/NrtAlertRuleTemplateProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/NrtAlertRuleTemplateProperties.java
@@ -12,6 +12,7 @@
 import com.azure.resourcemanager.securityinsights.models.AttackTactic;
 import com.azure.resourcemanager.securityinsights.models.EntityMapping;
 import com.azure.resourcemanager.securityinsights.models.EventGroupingSettings;
+import com.azure.resourcemanager.securityinsights.models.SentinelEntityMapping;
 import com.azure.resourcemanager.securityinsights.models.TemplateStatus;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -64,6 +65,16 @@ public final class NrtAlertRuleTemplateProperties extends AlertRuleTemplateWithM
     @JsonProperty(value = "eventGroupingSettings")
     private EventGroupingSettings eventGroupingSettings;
 
+    /*
+     * Array of the sentinel entity mappings of the alert rule
+     */
+    @JsonProperty(value = "sentinelEntitiesMappings")
+    private List<SentinelEntityMapping> sentinelEntitiesMappings;
+
+    /** Creates an instance of NrtAlertRuleTemplateProperties class. */
+    public NrtAlertRuleTemplateProperties() {
+    }
+
     /**
      * Get the query property: The query that creates alerts for this rule.
      *
@@ -206,6 +217,27 @@ public NrtAlertRuleTemplateProperties withEventGroupingSettings(EventGroupingSet
         return this;
     }
 
+    /**
+     * Get the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @return the sentinelEntitiesMappings value.
+     */
+    public List<SentinelEntityMapping> sentinelEntitiesMappings() {
+        return this.sentinelEntitiesMappings;
+    }
+
+    /**
+     * Set the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @param sentinelEntitiesMappings the sentinelEntitiesMappings value to set.
+     * @return the NrtAlertRuleTemplateProperties object itself.
+     */
+    public NrtAlertRuleTemplateProperties withSentinelEntitiesMappings(
+        List<SentinelEntityMapping> sentinelEntitiesMappings) {
+        this.sentinelEntitiesMappings = sentinelEntitiesMappings;
+        return this;
+    }
+
     /** {@inheritDoc} */
     @Override
     public NrtAlertRuleTemplateProperties withTactics(List<AttackTactic> tactics) {
@@ -274,5 +306,8 @@ public void validate() {
         if (eventGroupingSettings() != null) {
             eventGroupingSettings().validate();
         }
+        if (sentinelEntitiesMappings() != null) {
+            sentinelEntitiesMappings().forEach(e -> e.validate());
+        }
     }
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/Office365ProjectCheckRequirementsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/Office365ProjectCheckRequirementsProperties.java
index e79cb5b7768f..23caeff4c79a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/Office365ProjectCheckRequirementsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/Office365ProjectCheckRequirementsProperties.java
@@ -10,6 +10,10 @@
 /** Office365 Project requirements check properties. */
 @Fluent
 public final class Office365ProjectCheckRequirementsProperties extends DataConnectorTenantId {
+    /** Creates an instance of Office365ProjectCheckRequirementsProperties class. */
+    public Office365ProjectCheckRequirementsProperties() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public Office365ProjectCheckRequirementsProperties withTenantId(String tenantId) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/Office365ProjectDataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/Office365ProjectDataConnectorProperties.java
index 86464533c6a1..9e5927a477b9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/Office365ProjectDataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/Office365ProjectDataConnectorProperties.java
@@ -19,6 +19,10 @@ public final class Office365ProjectDataConnectorProperties extends DataConnector
     @JsonProperty(value = "dataTypes", required = true)
     private Office365ProjectConnectorDataTypes dataTypes;
 
+    /** Creates an instance of Office365ProjectDataConnectorProperties class. */
+    public Office365ProjectDataConnectorProperties() {
+    }
+
     /**
      * Get the dataTypes property: The available data types for the connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeAtpCheckRequirementsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeAtpCheckRequirementsProperties.java
index 7e6a246d93cb..58a9e2686802 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeAtpCheckRequirementsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeAtpCheckRequirementsProperties.java
@@ -10,6 +10,10 @@
 /** OfficeATP (Office 365 Advanced Threat Protection) requirements check properties. */
 @Fluent
 public final class OfficeAtpCheckRequirementsProperties extends DataConnectorTenantId {
+    /** Creates an instance of OfficeAtpCheckRequirementsProperties class. */
+    public OfficeAtpCheckRequirementsProperties() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public OfficeAtpCheckRequirementsProperties withTenantId(String tenantId) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeAtpDataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeAtpDataConnectorProperties.java
index 9a64b134a987..09263147abab 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeAtpDataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeAtpDataConnectorProperties.java
@@ -18,6 +18,10 @@ public final class OfficeAtpDataConnectorProperties extends DataConnectorTenantI
     @JsonProperty(value = "dataTypes")
     private AlertsDataTypeOfDataConnector dataTypes;
 
+    /** Creates an instance of OfficeAtpDataConnectorProperties class. */
+    public OfficeAtpDataConnectorProperties() {
+    }
+
     /**
      * Get the dataTypes property: The available data types for the connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeConsentInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeConsentInner.java
index e1ef2000626c..193fab161e3d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeConsentInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeConsentInner.java
@@ -24,6 +24,10 @@ public final class OfficeConsentInner extends ProxyResource {
     @JsonProperty(value = "systemData", access = JsonProperty.Access.WRITE_ONLY)
     private SystemData systemData;
 
+    /** Creates an instance of OfficeConsentInner class. */
+    public OfficeConsentInner() {
+    }
+
     /**
      * Get the innerProperties property: Office consent properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeConsentProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeConsentProperties.java
index ef163ee8eda7..8ee64090f57d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeConsentProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeConsentProperties.java
@@ -22,6 +22,10 @@ public final class OfficeConsentProperties {
     @JsonProperty(value = "consentId")
     private String consentId;
 
+    /** Creates an instance of OfficeConsentProperties class. */
+    public OfficeConsentProperties() {
+    }
+
     /**
      * Get the tenantId property: The tenantId of the Office365 with the consent.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeDataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeDataConnectorProperties.java
index 4b02a823625c..096c8e30c8b6 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeDataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeDataConnectorProperties.java
@@ -19,6 +19,10 @@ public final class OfficeDataConnectorProperties extends DataConnectorTenantId {
     @JsonProperty(value = "dataTypes", required = true)
     private OfficeDataConnectorDataTypes dataTypes;
 
+    /** Creates an instance of OfficeDataConnectorProperties class. */
+    public OfficeDataConnectorProperties() {
+    }
+
     /**
      * Get the dataTypes property: The available data types for the connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeIrmCheckRequirementsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeIrmCheckRequirementsProperties.java
index 5ae6bc407935..d7b6ff64086e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeIrmCheckRequirementsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeIrmCheckRequirementsProperties.java
@@ -10,6 +10,10 @@
 /** OfficeIRM (Microsoft Insider Risk Management) requirements check properties. */
 @Fluent
 public final class OfficeIrmCheckRequirementsProperties extends DataConnectorTenantId {
+    /** Creates an instance of OfficeIrmCheckRequirementsProperties class. */
+    public OfficeIrmCheckRequirementsProperties() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public OfficeIrmCheckRequirementsProperties withTenantId(String tenantId) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeIrmDataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeIrmDataConnectorProperties.java
index c3e618acc5a3..c8a3b73c57e1 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeIrmDataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficeIrmDataConnectorProperties.java
@@ -18,6 +18,10 @@ public final class OfficeIrmDataConnectorProperties extends DataConnectorTenantI
     @JsonProperty(value = "dataTypes")
     private AlertsDataTypeOfDataConnector dataTypes;
 
+    /** Creates an instance of OfficeIrmDataConnectorProperties class. */
+    public OfficeIrmDataConnectorProperties() {
+    }
+
     /**
      * Get the dataTypes property: The available data types for the connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficePowerBICheckRequirementsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficePowerBICheckRequirementsProperties.java
index b64db3bd6270..5208736cff32 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficePowerBICheckRequirementsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficePowerBICheckRequirementsProperties.java
@@ -10,6 +10,10 @@
 /** Office PowerBI requirements check properties. */
 @Fluent
 public final class OfficePowerBICheckRequirementsProperties extends DataConnectorTenantId {
+    /** Creates an instance of OfficePowerBICheckRequirementsProperties class. */
+    public OfficePowerBICheckRequirementsProperties() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public OfficePowerBICheckRequirementsProperties withTenantId(String tenantId) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficePowerBIDataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficePowerBIDataConnectorProperties.java
index 4f19d046961e..b62914d15bbc 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficePowerBIDataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OfficePowerBIDataConnectorProperties.java
@@ -19,6 +19,10 @@ public final class OfficePowerBIDataConnectorProperties extends DataConnectorTen
     @JsonProperty(value = "dataTypes", required = true)
     private OfficePowerBIConnectorDataTypes dataTypes;
 
+    /** Creates an instance of OfficePowerBIDataConnectorProperties class. */
+    public OfficePowerBIDataConnectorProperties() {
+    }
+
     /**
      * Get the dataTypes property: The available data types for the connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OperationInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OperationInner.java
index ec5a4d2872bb..b7fba78deacd 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OperationInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/OperationInner.java
@@ -35,6 +35,10 @@ public final class OperationInner {
     @JsonProperty(value = "isDataAction")
     private Boolean isDataAction;
 
+    /** Creates an instance of OperationInner class. */
+    public OperationInner() {
+    }
+
     /**
      * Get the display property: Properties of the operation.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ProcessEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ProcessEntityProperties.java
index b1dde6737938..655e1522bcbc 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ProcessEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ProcessEntityProperties.java
@@ -67,6 +67,10 @@ public final class ProcessEntityProperties extends EntityCommonProperties {
     @JsonProperty(value = "processId", access = JsonProperty.Access.WRITE_ONLY)
     private String processId;
 
+    /** Creates an instance of ProcessEntityProperties class. */
+    public ProcessEntityProperties() {
+    }
+
     /**
      * Get the accountEntityId property: The account entity id running the processes.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RegistryKeyEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RegistryKeyEntityProperties.java
index 405ab6789eaf..c8ab8e0f600c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RegistryKeyEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RegistryKeyEntityProperties.java
@@ -24,6 +24,10 @@ public final class RegistryKeyEntityProperties extends EntityCommonProperties {
     @JsonProperty(value = "key", access = JsonProperty.Access.WRITE_ONLY)
     private String key;
 
+    /** Creates an instance of RegistryKeyEntityProperties class. */
+    public RegistryKeyEntityProperties() {
+    }
+
     /**
      * Get the hive property: the hive that holds the registry key.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RegistryValueEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RegistryValueEntityProperties.java
index a15af888fb1b..a1db6026f23a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RegistryValueEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RegistryValueEntityProperties.java
@@ -37,6 +37,10 @@ public final class RegistryValueEntityProperties extends EntityCommonProperties
     @JsonProperty(value = "valueType", access = JsonProperty.Access.WRITE_ONLY)
     private RegistryValueKind valueType;
 
+    /** Creates an instance of RegistryValueEntityProperties class. */
+    public RegistryValueEntityProperties() {
+    }
+
     /**
      * Get the keyEntityId property: The registry key entity id.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RelationInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RelationInner.java
index 40a02c226353..407ab2618c47 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RelationInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RelationInner.java
@@ -17,6 +17,10 @@ public final class RelationInner extends ResourceWithEtag {
     @JsonProperty(value = "properties")
     private RelationProperties innerProperties;
 
+    /** Creates an instance of RelationInner class. */
+    public RelationInner() {
+    }
+
     /**
      * Get the innerProperties property: Relation properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RelationProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RelationProperties.java
index 99e3df52c8c1..d02e2734c093 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RelationProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RelationProperties.java
@@ -35,6 +35,10 @@ public final class RelationProperties {
     @JsonProperty(value = "relatedResourceKind", access = JsonProperty.Access.WRITE_ONLY)
     private String relatedResourceKind;
 
+    /** Creates an instance of RelationProperties class. */
+    public RelationProperties() {
+    }
+
     /**
      * Get the relatedResourceId property: The resource ID of the related resource.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RepoInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RepoInner.java
index dff64861cae5..877ea93a4510 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RepoInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/RepoInner.java
@@ -29,6 +29,10 @@ public final class RepoInner {
     @JsonProperty(value = "branches")
     private List<String> branches;
 
+    /** Creates an instance of RepoInner class. */
+    public RepoInner() {
+    }
+
     /**
      * Get the url property: The url to access the repository.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ScheduledAlertRuleProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ScheduledAlertRuleProperties.java
index 98738e4e2029..ea3d05c03f25 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ScheduledAlertRuleProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ScheduledAlertRuleProperties.java
@@ -13,6 +13,7 @@
 import com.azure.resourcemanager.securityinsights.models.EventGroupingSettings;
 import com.azure.resourcemanager.securityinsights.models.IncidentConfiguration;
 import com.azure.resourcemanager.securityinsights.models.ScheduledAlertRuleCommonProperties;
+import com.azure.resourcemanager.securityinsights.models.SentinelEntityMapping;
 import com.azure.resourcemanager.securityinsights.models.TriggerOperator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.time.Duration;
@@ -90,6 +91,10 @@ public final class ScheduledAlertRuleProperties extends ScheduledAlertRuleCommon
     @JsonProperty(value = "incidentConfiguration")
     private IncidentConfiguration incidentConfiguration;
 
+    /** Creates an instance of ScheduledAlertRuleProperties class. */
+    public ScheduledAlertRuleProperties() {
+    }
+
     /**
      * Get the alertRuleTemplateName property: The Name of the alert rule template used to create this rule.
      *
@@ -377,6 +382,14 @@ public ScheduledAlertRuleProperties withAlertDetailsOverride(AlertDetailsOverrid
         return this;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public ScheduledAlertRuleProperties withSentinelEntitiesMappings(
+        List<SentinelEntityMapping> sentinelEntitiesMappings) {
+        super.withSentinelEntitiesMappings(sentinelEntitiesMappings);
+        return this;
+    }
+
     /**
      * Validates the instance.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ScheduledAlertRuleTemplateProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ScheduledAlertRuleTemplateProperties.java
index 42be47785289..c8289dc020ba 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ScheduledAlertRuleTemplateProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ScheduledAlertRuleTemplateProperties.java
@@ -11,6 +11,7 @@
 import com.azure.resourcemanager.securityinsights.models.AttackTactic;
 import com.azure.resourcemanager.securityinsights.models.EntityMapping;
 import com.azure.resourcemanager.securityinsights.models.EventGroupingSettings;
+import com.azure.resourcemanager.securityinsights.models.SentinelEntityMapping;
 import com.azure.resourcemanager.securityinsights.models.TemplateStatus;
 import com.azure.resourcemanager.securityinsights.models.TriggerOperator;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -144,6 +145,16 @@ public final class ScheduledAlertRuleTemplateProperties {
     @JsonProperty(value = "alertDetailsOverride")
     private AlertDetailsOverride alertDetailsOverride;
 
+    /*
+     * Array of the sentinel entity mappings of the alert rule
+     */
+    @JsonProperty(value = "sentinelEntitiesMappings")
+    private List<SentinelEntityMapping> sentinelEntitiesMappings;
+
+    /** Creates an instance of ScheduledAlertRuleTemplateProperties class. */
+    public ScheduledAlertRuleTemplateProperties() {
+    }
+
     /**
      * Get the alertRulesCreatedByTemplateCount property: the number of alert rules that were created by this template.
      *
@@ -526,6 +537,27 @@ public ScheduledAlertRuleTemplateProperties withAlertDetailsOverride(AlertDetail
         return this;
     }
 
+    /**
+     * Get the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @return the sentinelEntitiesMappings value.
+     */
+    public List<SentinelEntityMapping> sentinelEntitiesMappings() {
+        return this.sentinelEntitiesMappings;
+    }
+
+    /**
+     * Set the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @param sentinelEntitiesMappings the sentinelEntitiesMappings value to set.
+     * @return the ScheduledAlertRuleTemplateProperties object itself.
+     */
+    public ScheduledAlertRuleTemplateProperties withSentinelEntitiesMappings(
+        List<SentinelEntityMapping> sentinelEntitiesMappings) {
+        this.sentinelEntitiesMappings = sentinelEntitiesMappings;
+        return this;
+    }
+
     /**
      * Validates the instance.
      *
@@ -544,5 +576,8 @@ public void validate() {
         if (alertDetailsOverride() != null) {
             alertDetailsOverride().validate();
         }
+        if (sentinelEntitiesMappings() != null) {
+            sentinelEntitiesMappings().forEach(e -> e.validate());
+        }
     }
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SecurityAlertProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SecurityAlertProperties.java
index 21db1aca93e5..b1ec169a23da 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SecurityAlertProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SecurityAlertProperties.java
@@ -171,6 +171,10 @@ public final class SecurityAlertProperties extends EntityCommonProperties {
     @JsonProperty(value = "resourceIdentifiers", access = JsonProperty.Access.WRITE_ONLY)
     private List<Object> resourceIdentifiers;
 
+    /** Creates an instance of SecurityAlertProperties class. */
+    public SecurityAlertProperties() {
+    }
+
     /**
      * Get the alertDisplayName property: The display name of the alert.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SecurityGroupEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SecurityGroupEntityProperties.java
index e6bf9c697c0a..c7704c108f5c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SecurityGroupEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SecurityGroupEntityProperties.java
@@ -30,6 +30,10 @@ public final class SecurityGroupEntityProperties extends EntityCommonProperties
     @JsonProperty(value = "sid", access = JsonProperty.Access.WRITE_ONLY)
     private String sid;
 
+    /** Creates an instance of SecurityGroupEntityProperties class. */
+    public SecurityGroupEntityProperties() {
+    }
+
     /**
      * Get the distinguishedName property: The group distinguished name.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SecurityMLAnalyticsSettingInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SecurityMLAnalyticsSettingInner.java
index 8bf08cc6714d..c6f751dfa6aa 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SecurityMLAnalyticsSettingInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SecurityMLAnalyticsSettingInner.java
@@ -21,6 +21,10 @@
 @JsonSubTypes({@JsonSubTypes.Type(name = "Anomaly", value = AnomalySecurityMLAnalyticsSettings.class)})
 @Fluent
 public class SecurityMLAnalyticsSettingInner extends ResourceWithEtag {
+    /** Creates an instance of SecurityMLAnalyticsSettingInner class. */
+    public SecurityMLAnalyticsSettingInner() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public SecurityMLAnalyticsSettingInner withEtag(String etag) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SentinelOnboardingStateInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SentinelOnboardingStateInner.java
index e46fd29c170a..368b6dbbd340 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SentinelOnboardingStateInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SentinelOnboardingStateInner.java
@@ -17,6 +17,10 @@ public final class SentinelOnboardingStateInner extends ResourceWithEtag {
     @JsonProperty(value = "properties")
     private SentinelOnboardingStateProperties innerProperties;
 
+    /** Creates an instance of SentinelOnboardingStateInner class. */
+    public SentinelOnboardingStateInner() {
+    }
+
     /**
      * Get the innerProperties property: The Sentinel onboarding state object.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SentinelOnboardingStateProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SentinelOnboardingStateProperties.java
index d1067a68a26d..881aae69ba58 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SentinelOnboardingStateProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SentinelOnboardingStateProperties.java
@@ -16,6 +16,10 @@ public final class SentinelOnboardingStateProperties {
     @JsonProperty(value = "customerManagedKey")
     private Boolean customerManagedKey;
 
+    /** Creates an instance of SentinelOnboardingStateProperties class. */
+    public SentinelOnboardingStateProperties() {
+    }
+
     /**
      * Get the customerManagedKey property: Flag that indicates the status of the CMK setting.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SentinelOnboardingStatesListInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SentinelOnboardingStatesListInner.java
index 420eae2ca857..aeef11eb5f71 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SentinelOnboardingStatesListInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SentinelOnboardingStatesListInner.java
@@ -18,6 +18,10 @@ public final class SentinelOnboardingStatesListInner {
     @JsonProperty(value = "value", required = true)
     private List<SentinelOnboardingStateInner> value;
 
+    /** Creates an instance of SentinelOnboardingStatesListInner class. */
+    public SentinelOnboardingStatesListInner() {
+    }
+
     /**
      * Get the value property: Array of Sentinel onboarding states.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SettingListInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SettingListInner.java
index bc77b021a5b5..884512698847 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SettingListInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SettingListInner.java
@@ -18,6 +18,10 @@ public final class SettingListInner {
     @JsonProperty(value = "value", required = true)
     private List<SettingsInner> value;
 
+    /** Creates an instance of SettingListInner class. */
+    public SettingListInner() {
+    }
+
     /**
      * Get the value property: Array of settings.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SettingsInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SettingsInner.java
index fe11570beafc..139df92031e0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SettingsInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SettingsInner.java
@@ -29,6 +29,10 @@
 })
 @Fluent
 public class SettingsInner extends ResourceWithEtag {
+    /** Creates an instance of SettingsInner class. */
+    public SettingsInner() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public SettingsInner withEtag(String etag) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SourceControlInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SourceControlInner.java
index 3d9c0096e645..ffb10634c8f2 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SourceControlInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SourceControlInner.java
@@ -24,6 +24,10 @@ public final class SourceControlInner extends ResourceWithEtag {
     @JsonProperty(value = "properties")
     private SourceControlProperties innerProperties;
 
+    /** Creates an instance of SourceControlInner class. */
+    public SourceControlInner() {
+    }
+
     /**
      * Get the innerProperties property: source control properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SourceControlProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SourceControlProperties.java
index c7b2417c0cdc..eeff41d6f706 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SourceControlProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SourceControlProperties.java
@@ -72,6 +72,10 @@ public final class SourceControlProperties {
     @JsonProperty(value = "lastDeploymentInfo")
     private DeploymentInfo lastDeploymentInfo;
 
+    /** Creates an instance of SourceControlProperties class. */
+    public SourceControlProperties() {
+    }
+
     /**
      * Get the id property: The id (a Guid) of the source control.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SubmissionMailEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SubmissionMailEntityProperties.java
index b676b6b71061..3aa288796faa 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SubmissionMailEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/SubmissionMailEntityProperties.java
@@ -73,6 +73,10 @@ public final class SubmissionMailEntityProperties extends EntityCommonProperties
     @JsonProperty(value = "reportType", access = JsonProperty.Access.WRITE_ONLY)
     private String reportType;
 
+    /** Creates an instance of SubmissionMailEntityProperties class. */
+    public SubmissionMailEntityProperties() {
+    }
+
     /**
      * Get the networkMessageId property: The network message id of email to which submission belongs.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TICheckRequirementsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TICheckRequirementsProperties.java
index defd84d01805..ff64044d5b37 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TICheckRequirementsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TICheckRequirementsProperties.java
@@ -10,6 +10,10 @@
 /** Threat Intelligence Platforms data connector required properties. */
 @Fluent
 public final class TICheckRequirementsProperties extends DataConnectorTenantId {
+    /** Creates an instance of TICheckRequirementsProperties class. */
+    public TICheckRequirementsProperties() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public TICheckRequirementsProperties withTenantId(String tenantId) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TIDataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TIDataConnectorProperties.java
index 62d09af2a1b6..1b2535acb3e7 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TIDataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TIDataConnectorProperties.java
@@ -26,6 +26,10 @@ public final class TIDataConnectorProperties extends DataConnectorTenantId {
     @JsonProperty(value = "dataTypes", required = true)
     private TIDataConnectorDataTypes dataTypes;
 
+    /** Creates an instance of TIDataConnectorProperties class. */
+    public TIDataConnectorProperties() {
+    }
+
     /**
      * Get the tipLookbackPeriod property: The lookback period for the feed to be imported.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TeamInformationInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TeamInformationInner.java
index 9054e9c2939e..1a536481b443 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TeamInformationInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TeamInformationInner.java
@@ -41,6 +41,10 @@ public final class TeamInformationInner {
     @JsonProperty(value = "description", access = JsonProperty.Access.WRITE_ONLY)
     private String description;
 
+    /** Creates an instance of TeamInformationInner class. */
+    public TeamInformationInner() {
+    }
+
     /**
      * Get the teamId property: Team ID.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceAlertRuleProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceAlertRuleProperties.java
index 3118a288a38b..70f785959f8e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceAlertRuleProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceAlertRuleProperties.java
@@ -63,6 +63,10 @@ public final class ThreatIntelligenceAlertRuleProperties {
     @JsonProperty(value = "techniques", access = JsonProperty.Access.WRITE_ONLY)
     private List<String> techniques;
 
+    /** Creates an instance of ThreatIntelligenceAlertRuleProperties class. */
+    public ThreatIntelligenceAlertRuleProperties() {
+    }
+
     /**
      * Get the alertRuleTemplateName property: The Name of the alert rule template used to create this rule.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceAlertRuleTemplateProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceAlertRuleTemplateProperties.java
index 2cabad3ea765..18b8059b2001 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceAlertRuleTemplateProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceAlertRuleTemplateProperties.java
@@ -23,6 +23,10 @@ public final class ThreatIntelligenceAlertRuleTemplateProperties extends AlertRu
     @JsonProperty(value = "severity", required = true)
     private AlertSeverity severity;
 
+    /** Creates an instance of ThreatIntelligenceAlertRuleTemplateProperties class. */
+    public ThreatIntelligenceAlertRuleTemplateProperties() {
+    }
+
     /**
      * Get the severity property: The severity for alerts created by this alert rule.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceIndicatorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceIndicatorProperties.java
index 94e3ad449679..a0475d7a8067 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceIndicatorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceIndicatorProperties.java
@@ -187,6 +187,10 @@ public final class ThreatIntelligenceIndicatorProperties extends EntityCommonPro
     @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, Object> extensions;
 
+    /** Creates an instance of ThreatIntelligenceIndicatorProperties class. */
+    public ThreatIntelligenceIndicatorProperties() {
+    }
+
     /**
      * Get the threatIntelligenceTags property: List of tags.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceInformationInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceInformationInner.java
index 66c6f53009c5..5930206a3955 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceInformationInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceInformationInner.java
@@ -21,6 +21,10 @@
 @JsonSubTypes({@JsonSubTypes.Type(name = "indicator", value = ThreatIntelligenceIndicatorModel.class)})
 @Fluent
 public class ThreatIntelligenceInformationInner extends ResourceWithEtag {
+    /** Creates an instance of ThreatIntelligenceInformationInner class. */
+    public ThreatIntelligenceInformationInner() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public ThreatIntelligenceInformationInner withEtag(String etag) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceMetricsListInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceMetricsListInner.java
index fccc6810b44c..94a545978b2e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceMetricsListInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/ThreatIntelligenceMetricsListInner.java
@@ -19,6 +19,10 @@ public final class ThreatIntelligenceMetricsListInner {
     @JsonProperty(value = "value", required = true)
     private List<ThreatIntelligenceMetrics> value;
 
+    /** Creates an instance of ThreatIntelligenceMetricsListInner class. */
+    public ThreatIntelligenceMetricsListInner() {
+    }
+
     /**
      * Get the value property: Array of threat intelligence metric fields (type/threat type/source).
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TiTaxiiCheckRequirementsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TiTaxiiCheckRequirementsProperties.java
index e65e280aade2..f7ded23fff1a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TiTaxiiCheckRequirementsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TiTaxiiCheckRequirementsProperties.java
@@ -10,6 +10,10 @@
 /** Threat Intelligence TAXII data connector required properties. */
 @Fluent
 public final class TiTaxiiCheckRequirementsProperties extends DataConnectorTenantId {
+    /** Creates an instance of TiTaxiiCheckRequirementsProperties class. */
+    public TiTaxiiCheckRequirementsProperties() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public TiTaxiiCheckRequirementsProperties withTenantId(String tenantId) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TiTaxiiDataConnectorProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TiTaxiiDataConnectorProperties.java
index 2faf94e2db69..8687745a9712 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TiTaxiiDataConnectorProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/TiTaxiiDataConnectorProperties.java
@@ -69,6 +69,10 @@ public final class TiTaxiiDataConnectorProperties extends DataConnectorTenantId
     @JsonProperty(value = "dataTypes", required = true)
     private TiTaxiiDataConnectorDataTypes dataTypes;
 
+    /** Creates an instance of TiTaxiiDataConnectorProperties class. */
+    public TiTaxiiDataConnectorProperties() {
+    }
+
     /**
      * Get the workspaceId property: The workspace id.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/UebaProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/UebaProperties.java
index 9a9c6252b395..0d21abf12816 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/UebaProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/UebaProperties.java
@@ -18,6 +18,10 @@ public final class UebaProperties {
     @JsonProperty(value = "dataSources")
     private List<UebaDataSources> dataSources;
 
+    /** Creates an instance of UebaProperties class. */
+    public UebaProperties() {
+    }
+
     /**
      * Get the dataSources property: The relevant data sources that enriched by ueba.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/UrlEntityProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/UrlEntityProperties.java
index 833855a5cdd7..7ccc954ce3dd 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/UrlEntityProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/UrlEntityProperties.java
@@ -17,6 +17,10 @@ public final class UrlEntityProperties extends EntityCommonProperties {
     @JsonProperty(value = "url", access = JsonProperty.Access.WRITE_ONLY)
     private String url;
 
+    /** Creates an instance of UrlEntityProperties class. */
+    public UrlEntityProperties() {
+    }
+
     /**
      * Get the url property: A full URL the entity points to.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WatchlistInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WatchlistInner.java
index 14c1ca299bc2..7f06069b0f5d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WatchlistInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WatchlistInner.java
@@ -22,6 +22,10 @@ public final class WatchlistInner extends ResourceWithEtag {
     @JsonProperty(value = "properties")
     private WatchlistProperties innerProperties;
 
+    /** Creates an instance of WatchlistInner class. */
+    public WatchlistInner() {
+    }
+
     /**
      * Get the innerProperties property: Watchlist properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WatchlistItemInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WatchlistItemInner.java
index e7424ae99545..f298a0f775a1 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WatchlistItemInner.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WatchlistItemInner.java
@@ -20,6 +20,10 @@ public final class WatchlistItemInner extends ResourceWithEtag {
     @JsonProperty(value = "properties")
     private WatchlistItemProperties innerProperties;
 
+    /** Creates an instance of WatchlistItemInner class. */
+    public WatchlistItemInner() {
+    }
+
     /**
      * Get the innerProperties property: Watchlist Item properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WatchlistItemProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WatchlistItemProperties.java
index b33026a9990e..ba191468ef50 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WatchlistItemProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WatchlistItemProperties.java
@@ -77,6 +77,10 @@ public final class WatchlistItemProperties {
     @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, Object> entityMapping;
 
+    /** Creates an instance of WatchlistItemProperties class. */
+    public WatchlistItemProperties() {
+    }
+
     /**
      * Get the watchlistItemType property: The type of the watchlist item.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WatchlistProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WatchlistProperties.java
index 97fa95571482..8ba48690ce1f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WatchlistProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WatchlistProperties.java
@@ -146,6 +146,10 @@ public final class WatchlistProperties {
     @JsonProperty(value = "uploadStatus")
     private String uploadStatus;
 
+    /** Creates an instance of WatchlistProperties class. */
+    public WatchlistProperties() {
+    }
+
     /**
      * Get the watchlistId property: The id (a Guid) of the watchlist.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WorkspaceManagerConfigurationInner.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WorkspaceManagerConfigurationInner.java
new file mode 100644
index 000000000000..fd3b44b9c009
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WorkspaceManagerConfigurationInner.java
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.resourcemanager.securityinsights.models.AzureEntityResource;
+import com.azure.resourcemanager.securityinsights.models.Mode;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/** The workspace manager configuration. */
+@Fluent
+public final class WorkspaceManagerConfigurationInner extends AzureEntityResource {
+    /*
+     * The workspace manager configuration object
+     */
+    @JsonProperty(value = "properties")
+    private WorkspaceManagerConfigurationProperties innerProperties;
+
+    /** Creates an instance of WorkspaceManagerConfigurationInner class. */
+    public WorkspaceManagerConfigurationInner() {
+    }
+
+    /**
+     * Get the innerProperties property: The workspace manager configuration object.
+     *
+     * @return the innerProperties value.
+     */
+    private WorkspaceManagerConfigurationProperties innerProperties() {
+        return this.innerProperties;
+    }
+
+    /**
+     * Get the mode property: The current mode of the workspace manager configuration.
+     *
+     * @return the mode value.
+     */
+    public Mode mode() {
+        return this.innerProperties() == null ? null : this.innerProperties().mode();
+    }
+
+    /**
+     * Set the mode property: The current mode of the workspace manager configuration.
+     *
+     * @param mode the mode value to set.
+     * @return the WorkspaceManagerConfigurationInner object itself.
+     */
+    public WorkspaceManagerConfigurationInner withMode(Mode mode) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new WorkspaceManagerConfigurationProperties();
+        }
+        this.innerProperties().withMode(mode);
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     *
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    @Override
+    public void validate() {
+        super.validate();
+        if (innerProperties() != null) {
+            innerProperties().validate();
+        }
+    }
+}
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WorkspaceManagerConfigurationProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WorkspaceManagerConfigurationProperties.java
new file mode 100644
index 000000000000..3977281952b4
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/fluent/models/WorkspaceManagerConfigurationProperties.java
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.resourcemanager.securityinsights.models.Mode;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/** The workspace manager configuration properties. */
+@Fluent
+public final class WorkspaceManagerConfigurationProperties {
+    /*
+     * The current mode of the workspace manager configuration
+     */
+    @JsonProperty(value = "mode", required = true)
+    private Mode mode;
+
+    /** Creates an instance of WorkspaceManagerConfigurationProperties class. */
+    public WorkspaceManagerConfigurationProperties() {
+    }
+
+    /**
+     * Get the mode property: The current mode of the workspace manager configuration.
+     *
+     * @return the mode value.
+     */
+    public Mode mode() {
+        return this.mode;
+    }
+
+    /**
+     * Set the mode property: The current mode of the workspace manager configuration.
+     *
+     * @param mode the mode value to set.
+     * @return the WorkspaceManagerConfigurationProperties object itself.
+     */
+    public WorkspaceManagerConfigurationProperties withMode(Mode mode) {
+        this.mode = mode;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     *
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (mode() == null) {
+            throw LOGGER
+                .logExceptionAsError(
+                    new IllegalArgumentException(
+                        "Missing required property mode in model WorkspaceManagerConfigurationProperties"));
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(WorkspaceManagerConfigurationProperties.class);
+}
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ActionsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ActionsClientImpl.java
index 7b08804507b7..03b621cba874 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ActionsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ActionsClientImpl.java
@@ -477,14 +477,16 @@ private Mono<ActionResponseInner> getAsync(
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
      * @param actionId Action ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the action of alert rule.
+     * @return the action of alert rule along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public ActionResponseInner get(String resourceGroupName, String workspaceName, String ruleId, String actionId) {
-        return getAsync(resourceGroupName, workspaceName, ruleId, actionId).block();
+    public Response<ActionResponseInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String ruleId, String actionId, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, ruleId, actionId, context).block();
     }
 
     /**
@@ -494,16 +496,14 @@ public ActionResponseInner get(String resourceGroupName, String workspaceName, S
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
      * @param actionId Action ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the action of alert rule along with {@link Response}.
+     * @return the action of alert rule.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<ActionResponseInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String ruleId, String actionId, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, ruleId, actionId, context).block();
+    public ActionResponseInner get(String resourceGroupName, String workspaceName, String ruleId, String actionId) {
+        return getWithResponse(resourceGroupName, workspaceName, ruleId, actionId, Context.NONE).getValue();
     }
 
     /**
@@ -667,15 +667,22 @@ private Mono<ActionResponseInner> createOrUpdateAsync(
      * @param ruleId Alert rule ID.
      * @param actionId Action ID.
      * @param action The action.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return action for alert rule.
+     * @return action for alert rule along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public ActionResponseInner createOrUpdate(
-        String resourceGroupName, String workspaceName, String ruleId, String actionId, ActionRequest action) {
-        return createOrUpdateAsync(resourceGroupName, workspaceName, ruleId, actionId, action).block();
+    public Response<ActionResponseInner> createOrUpdateWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String ruleId,
+        String actionId,
+        ActionRequest action,
+        Context context) {
+        return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, ruleId, actionId, action, context)
+            .block();
     }
 
     /**
@@ -686,22 +693,16 @@ public ActionResponseInner createOrUpdate(
      * @param ruleId Alert rule ID.
      * @param actionId Action ID.
      * @param action The action.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return action for alert rule along with {@link Response}.
+     * @return action for alert rule.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<ActionResponseInner> createOrUpdateWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String ruleId,
-        String actionId,
-        ActionRequest action,
-        Context context) {
-        return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, ruleId, actionId, action, context)
-            .block();
+    public ActionResponseInner createOrUpdate(
+        String resourceGroupName, String workspaceName, String ruleId, String actionId, ActionRequest action) {
+        return createOrUpdateWithResponse(resourceGroupName, workspaceName, ruleId, actionId, action, Context.NONE)
+            .getValue();
     }
 
     /**
@@ -843,13 +844,16 @@ private Mono<Void> deleteAsync(String resourceGroupName, String workspaceName, S
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
      * @param actionId Action ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String ruleId, String actionId) {
-        deleteAsync(resourceGroupName, workspaceName, ruleId, actionId).block();
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String ruleId, String actionId, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, ruleId, actionId, context).block();
     }
 
     /**
@@ -859,16 +863,13 @@ public void delete(String resourceGroupName, String workspaceName, String ruleId
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
      * @param actionId Action ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String ruleId, String actionId, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, ruleId, actionId, context).block();
+    public void delete(String resourceGroupName, String workspaceName, String ruleId, String actionId) {
+        deleteWithResponse(resourceGroupName, workspaceName, ruleId, actionId, Context.NONE);
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ActionsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ActionsImpl.java
index 09f8ea57b333..f4284ef8eb34 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ActionsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ActionsImpl.java
@@ -41,15 +41,6 @@ public PagedIterable<ActionResponse> listByAlertRule(
         return Utils.mapPage(inner, inner1 -> new ActionResponseImpl(inner1, this.manager()));
     }
 
-    public ActionResponse get(String resourceGroupName, String workspaceName, String ruleId, String actionId) {
-        ActionResponseInner inner = this.serviceClient().get(resourceGroupName, workspaceName, ruleId, actionId);
-        if (inner != null) {
-            return new ActionResponseImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<ActionResponse> getWithResponse(
         String resourceGroupName, String workspaceName, String ruleId, String actionId, Context context) {
         Response<ActionResponseInner> inner =
@@ -65,8 +56,13 @@ public Response<ActionResponse> getWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String ruleId, String actionId) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, ruleId, actionId);
+    public ActionResponse get(String resourceGroupName, String workspaceName, String ruleId, String actionId) {
+        ActionResponseInner inner = this.serviceClient().get(resourceGroupName, workspaceName, ruleId, actionId);
+        if (inner != null) {
+            return new ActionResponseImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -74,6 +70,10 @@ public Response<Void> deleteWithResponse(
         return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, ruleId, actionId, context);
     }
 
+    public void delete(String resourceGroupName, String workspaceName, String ruleId, String actionId) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, ruleId, actionId);
+    }
+
     public ActionResponse getById(String id) {
         String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
         if (resourceGroupName == null) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AlertRuleTemplatesClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AlertRuleTemplatesClientImpl.java
index d017573675b9..20f5477e07ad 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AlertRuleTemplatesClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AlertRuleTemplatesClientImpl.java
@@ -407,14 +407,16 @@ private Mono<AlertRuleTemplateInner> getAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param alertRuleTemplateId Alert rule template ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the alert rule template.
+     * @return the alert rule template along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public AlertRuleTemplateInner get(String resourceGroupName, String workspaceName, String alertRuleTemplateId) {
-        return getAsync(resourceGroupName, workspaceName, alertRuleTemplateId).block();
+    public Response<AlertRuleTemplateInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String alertRuleTemplateId, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, alertRuleTemplateId, context).block();
     }
 
     /**
@@ -423,16 +425,14 @@ public AlertRuleTemplateInner get(String resourceGroupName, String workspaceName
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param alertRuleTemplateId Alert rule template ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the alert rule template along with {@link Response}.
+     * @return the alert rule template.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<AlertRuleTemplateInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String alertRuleTemplateId, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, alertRuleTemplateId, context).block();
+    public AlertRuleTemplateInner get(String resourceGroupName, String workspaceName, String alertRuleTemplateId) {
+        return getWithResponse(resourceGroupName, workspaceName, alertRuleTemplateId, Context.NONE).getValue();
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AlertRuleTemplatesImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AlertRuleTemplatesImpl.java
index e5bdc4bc9ffc..a8a1e69eefb4 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AlertRuleTemplatesImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AlertRuleTemplatesImpl.java
@@ -39,15 +39,6 @@ public PagedIterable<AlertRuleTemplate> list(String resourceGroupName, String wo
         return Utils.mapPage(inner, inner1 -> new AlertRuleTemplateImpl(inner1, this.manager()));
     }
 
-    public AlertRuleTemplate get(String resourceGroupName, String workspaceName, String alertRuleTemplateId) {
-        AlertRuleTemplateInner inner = this.serviceClient().get(resourceGroupName, workspaceName, alertRuleTemplateId);
-        if (inner != null) {
-            return new AlertRuleTemplateImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<AlertRuleTemplate> getWithResponse(
         String resourceGroupName, String workspaceName, String alertRuleTemplateId, Context context) {
         Response<AlertRuleTemplateInner> inner =
@@ -63,6 +54,15 @@ public Response<AlertRuleTemplate> getWithResponse(
         }
     }
 
+    public AlertRuleTemplate get(String resourceGroupName, String workspaceName, String alertRuleTemplateId) {
+        AlertRuleTemplateInner inner = this.serviceClient().get(resourceGroupName, workspaceName, alertRuleTemplateId);
+        if (inner != null) {
+            return new AlertRuleTemplateImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     private AlertRuleTemplatesClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AlertRulesClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AlertRulesClientImpl.java
index e092a7beec6d..00b1c8c3d835 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AlertRulesClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AlertRulesClientImpl.java
@@ -437,14 +437,16 @@ private Mono<AlertRuleInner> getAsync(String resourceGroupName, String workspace
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the alert rule.
+     * @return the alert rule along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public AlertRuleInner get(String resourceGroupName, String workspaceName, String ruleId) {
-        return getAsync(resourceGroupName, workspaceName, ruleId).block();
+    public Response<AlertRuleInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String ruleId, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, ruleId, context).block();
     }
 
     /**
@@ -453,16 +455,14 @@ public AlertRuleInner get(String resourceGroupName, String workspaceName, String
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the alert rule along with {@link Response}.
+     * @return the alert rule.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<AlertRuleInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String ruleId, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, ruleId, context).block();
+    public AlertRuleInner get(String resourceGroupName, String workspaceName, String ruleId) {
+        return getWithResponse(resourceGroupName, workspaceName, ruleId, Context.NONE).getValue();
     }
 
     /**
@@ -609,15 +609,16 @@ private Mono<AlertRuleInner> createOrUpdateAsync(
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
      * @param alertRule The alert rule.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return alert rule.
+     * @return alert rule along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public AlertRuleInner createOrUpdate(
-        String resourceGroupName, String workspaceName, String ruleId, AlertRuleInner alertRule) {
-        return createOrUpdateAsync(resourceGroupName, workspaceName, ruleId, alertRule).block();
+    public Response<AlertRuleInner> createOrUpdateWithResponse(
+        String resourceGroupName, String workspaceName, String ruleId, AlertRuleInner alertRule, Context context) {
+        return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, ruleId, alertRule, context).block();
     }
 
     /**
@@ -627,16 +628,15 @@ public AlertRuleInner createOrUpdate(
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
      * @param alertRule The alert rule.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return alert rule along with {@link Response}.
+     * @return alert rule.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<AlertRuleInner> createOrUpdateWithResponse(
-        String resourceGroupName, String workspaceName, String ruleId, AlertRuleInner alertRule, Context context) {
-        return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, ruleId, alertRule, context).block();
+    public AlertRuleInner createOrUpdate(
+        String resourceGroupName, String workspaceName, String ruleId, AlertRuleInner alertRule) {
+        return createOrUpdateWithResponse(resourceGroupName, workspaceName, ruleId, alertRule, Context.NONE).getValue();
     }
 
     /**
@@ -765,13 +765,16 @@ private Mono<Void> deleteAsync(String resourceGroupName, String workspaceName, S
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String ruleId) {
-        deleteAsync(resourceGroupName, workspaceName, ruleId).block();
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String ruleId, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, ruleId, context).block();
     }
 
     /**
@@ -780,16 +783,13 @@ public void delete(String resourceGroupName, String workspaceName, String ruleId
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String ruleId, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, ruleId, context).block();
+    public void delete(String resourceGroupName, String workspaceName, String ruleId) {
+        deleteWithResponse(resourceGroupName, workspaceName, ruleId, Context.NONE);
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AlertRulesImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AlertRulesImpl.java
index 4f4d06aa4fa9..02bf47b98521 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AlertRulesImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AlertRulesImpl.java
@@ -38,15 +38,6 @@ public PagedIterable<AlertRule> list(String resourceGroupName, String workspaceN
         return Utils.mapPage(inner, inner1 -> new AlertRuleImpl(inner1, this.manager()));
     }
 
-    public AlertRule get(String resourceGroupName, String workspaceName, String ruleId) {
-        AlertRuleInner inner = this.serviceClient().get(resourceGroupName, workspaceName, ruleId);
-        if (inner != null) {
-            return new AlertRuleImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<AlertRule> getWithResponse(
         String resourceGroupName, String workspaceName, String ruleId, Context context) {
         Response<AlertRuleInner> inner =
@@ -62,9 +53,8 @@ public Response<AlertRule> getWithResponse(
         }
     }
 
-    public AlertRule createOrUpdate(
-        String resourceGroupName, String workspaceName, String ruleId, AlertRuleInner alertRule) {
-        AlertRuleInner inner = this.serviceClient().createOrUpdate(resourceGroupName, workspaceName, ruleId, alertRule);
+    public AlertRule get(String resourceGroupName, String workspaceName, String ruleId) {
+        AlertRuleInner inner = this.serviceClient().get(resourceGroupName, workspaceName, ruleId);
         if (inner != null) {
             return new AlertRuleImpl(inner, this.manager());
         } else {
@@ -89,8 +79,14 @@ public Response<AlertRule> createOrUpdateWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String ruleId) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, ruleId);
+    public AlertRule createOrUpdate(
+        String resourceGroupName, String workspaceName, String ruleId, AlertRuleInner alertRule) {
+        AlertRuleInner inner = this.serviceClient().createOrUpdate(resourceGroupName, workspaceName, ruleId, alertRule);
+        if (inner != null) {
+            return new AlertRuleImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -98,6 +94,10 @@ public Response<Void> deleteWithResponse(
         return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, ruleId, context);
     }
 
+    public void delete(String resourceGroupName, String workspaceName, String ruleId) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, ruleId);
+    }
+
     private AlertRulesClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AutomationRulesClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AutomationRulesClientImpl.java
index 68b5fbf01089..eb7a4c9e7c60 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AutomationRulesClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AutomationRulesClientImpl.java
@@ -264,14 +264,16 @@ private Mono<AutomationRuleInner> getAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param automationRuleId Automation rule ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the automation rule.
+     * @return the automation rule along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public AutomationRuleInner get(String resourceGroupName, String workspaceName, String automationRuleId) {
-        return getAsync(resourceGroupName, workspaceName, automationRuleId).block();
+    public Response<AutomationRuleInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String automationRuleId, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, automationRuleId, context).block();
     }
 
     /**
@@ -280,16 +282,14 @@ public AutomationRuleInner get(String resourceGroupName, String workspaceName, S
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param automationRuleId Automation rule ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the automation rule along with {@link Response}.
+     * @return the automation rule.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<AutomationRuleInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String automationRuleId, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, automationRuleId, context).block();
+    public AutomationRuleInner get(String resourceGroupName, String workspaceName, String automationRuleId) {
+        return getWithResponse(resourceGroupName, workspaceName, automationRuleId, Context.NONE).getValue();
     }
 
     /**
@@ -421,7 +421,6 @@ private Mono<Response<AutomationRuleInner>> createOrUpdateWithResponseAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param automationRuleId Automation rule ID.
-     * @param automationRuleToUpsert The automation rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -429,10 +428,8 @@ private Mono<Response<AutomationRuleInner>> createOrUpdateWithResponseAsync(
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<AutomationRuleInner> createOrUpdateAsync(
-        String resourceGroupName,
-        String workspaceName,
-        String automationRuleId,
-        AutomationRuleInner automationRuleToUpsert) {
+        String resourceGroupName, String workspaceName, String automationRuleId) {
+        final AutomationRuleInner automationRuleToUpsert = null;
         return createOrUpdateWithResponseAsync(
                 resourceGroupName, workspaceName, automationRuleId, automationRuleToUpsert)
             .flatMap(res -> Mono.justOrEmpty(res.getValue()));
@@ -444,18 +441,23 @@ private Mono<AutomationRuleInner> createOrUpdateAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param automationRuleId Automation rule ID.
+     * @param automationRuleToUpsert The automation rule.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response body on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<AutomationRuleInner> createOrUpdateAsync(
-        String resourceGroupName, String workspaceName, String automationRuleId) {
-        final AutomationRuleInner automationRuleToUpsert = null;
+    public Response<AutomationRuleInner> createOrUpdateWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String automationRuleId,
+        AutomationRuleInner automationRuleToUpsert,
+        Context context) {
         return createOrUpdateWithResponseAsync(
-                resourceGroupName, workspaceName, automationRuleId, automationRuleToUpsert)
-            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+                resourceGroupName, workspaceName, automationRuleId, automationRuleToUpsert, context)
+            .block();
     }
 
     /**
@@ -472,32 +474,9 @@ private Mono<AutomationRuleInner> createOrUpdateAsync(
     @ServiceMethod(returns = ReturnType.SINGLE)
     public AutomationRuleInner createOrUpdate(String resourceGroupName, String workspaceName, String automationRuleId) {
         final AutomationRuleInner automationRuleToUpsert = null;
-        return createOrUpdateAsync(resourceGroupName, workspaceName, automationRuleId, automationRuleToUpsert).block();
-    }
-
-    /**
-     * Creates or updates the automation rule.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param automationRuleId Automation rule ID.
-     * @param automationRuleToUpsert The automation rule.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response body along with {@link Response}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<AutomationRuleInner> createOrUpdateWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String automationRuleId,
-        AutomationRuleInner automationRuleToUpsert,
-        Context context) {
-        return createOrUpdateWithResponseAsync(
-                resourceGroupName, workspaceName, automationRuleId, automationRuleToUpsert, context)
-            .block();
+        return createOrUpdateWithResponse(
+                resourceGroupName, workspaceName, automationRuleId, automationRuleToUpsert, Context.NONE)
+            .getValue();
     }
 
     /**
@@ -629,14 +608,16 @@ private Mono<Object> deleteAsync(String resourceGroupName, String workspaceName,
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param automationRuleId Automation rule ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return any object.
+     * @return any object along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Object delete(String resourceGroupName, String workspaceName, String automationRuleId) {
-        return deleteAsync(resourceGroupName, workspaceName, automationRuleId).block();
+    public Response<Object> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String automationRuleId, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, automationRuleId, context).block();
     }
 
     /**
@@ -645,16 +626,14 @@ public Object delete(String resourceGroupName, String workspaceName, String auto
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param automationRuleId Automation rule ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return any object along with {@link Response}.
+     * @return any object.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Object> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String automationRuleId, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, automationRuleId, context).block();
+    public Object delete(String resourceGroupName, String workspaceName, String automationRuleId) {
+        return deleteWithResponse(resourceGroupName, workspaceName, automationRuleId, Context.NONE).getValue();
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AutomationRulesImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AutomationRulesImpl.java
index 90cf494caf3d..4933ef8b33fc 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AutomationRulesImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/AutomationRulesImpl.java
@@ -28,15 +28,6 @@ public AutomationRulesImpl(
         this.serviceManager = serviceManager;
     }
 
-    public AutomationRule get(String resourceGroupName, String workspaceName, String automationRuleId) {
-        AutomationRuleInner inner = this.serviceClient().get(resourceGroupName, workspaceName, automationRuleId);
-        if (inner != null) {
-            return new AutomationRuleImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<AutomationRule> getWithResponse(
         String resourceGroupName, String workspaceName, String automationRuleId, Context context) {
         Response<AutomationRuleInner> inner =
@@ -52,8 +43,13 @@ public Response<AutomationRule> getWithResponse(
         }
     }
 
-    public Object delete(String resourceGroupName, String workspaceName, String automationRuleId) {
-        return this.serviceClient().delete(resourceGroupName, workspaceName, automationRuleId);
+    public AutomationRule get(String resourceGroupName, String workspaceName, String automationRuleId) {
+        AutomationRuleInner inner = this.serviceClient().get(resourceGroupName, workspaceName, automationRuleId);
+        if (inner != null) {
+            return new AutomationRuleImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Object> deleteWithResponse(
@@ -61,6 +57,10 @@ public Response<Object> deleteWithResponse(
         return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, automationRuleId, context);
     }
 
+    public Object delete(String resourceGroupName, String workspaceName, String automationRuleId) {
+        return this.serviceClient().delete(resourceGroupName, workspaceName, automationRuleId);
+    }
+
     public PagedIterable<AutomationRule> list(String resourceGroupName, String workspaceName) {
         PagedIterable<AutomationRuleInner> inner = this.serviceClient().list(resourceGroupName, workspaceName);
         return Utils.mapPage(inner, inner1 -> new AutomationRuleImpl(inner1, this.manager()));
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarkOperationsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarkOperationsClientImpl.java
index 0e1ed907707d..0a210f577f81 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarkOperationsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarkOperationsClientImpl.java
@@ -221,15 +221,20 @@ private Mono<BookmarkExpandResponseInner> expandAsync(
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param parameters The parameters required to execute an expand operation on the given bookmark.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the entity expansion result operation response.
+     * @return the entity expansion result operation response along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public BookmarkExpandResponseInner expand(
-        String resourceGroupName, String workspaceName, String bookmarkId, BookmarkExpandParameters parameters) {
-        return expandAsync(resourceGroupName, workspaceName, bookmarkId, parameters).block();
+    public Response<BookmarkExpandResponseInner> expandWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String bookmarkId,
+        BookmarkExpandParameters parameters,
+        Context context) {
+        return expandWithResponseAsync(resourceGroupName, workspaceName, bookmarkId, parameters, context).block();
     }
 
     /**
@@ -239,19 +244,14 @@ public BookmarkExpandResponseInner expand(
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param parameters The parameters required to execute an expand operation on the given bookmark.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the entity expansion result operation response along with {@link Response}.
+     * @return the entity expansion result operation response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<BookmarkExpandResponseInner> expandWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String bookmarkId,
-        BookmarkExpandParameters parameters,
-        Context context) {
-        return expandWithResponseAsync(resourceGroupName, workspaceName, bookmarkId, parameters, context).block();
+    public BookmarkExpandResponseInner expand(
+        String resourceGroupName, String workspaceName, String bookmarkId, BookmarkExpandParameters parameters) {
+        return expandWithResponse(resourceGroupName, workspaceName, bookmarkId, parameters, Context.NONE).getValue();
     }
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarkOperationsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarkOperationsImpl.java
index 40b134363e7c..ed23df352e99 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarkOperationsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarkOperationsImpl.java
@@ -28,17 +28,6 @@ public BookmarkOperationsImpl(
         this.serviceManager = serviceManager;
     }
 
-    public BookmarkExpandResponse expand(
-        String resourceGroupName, String workspaceName, String bookmarkId, BookmarkExpandParameters parameters) {
-        BookmarkExpandResponseInner inner =
-            this.serviceClient().expand(resourceGroupName, workspaceName, bookmarkId, parameters);
-        if (inner != null) {
-            return new BookmarkExpandResponseImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<BookmarkExpandResponse> expandWithResponse(
         String resourceGroupName,
         String workspaceName,
@@ -58,6 +47,17 @@ public Response<BookmarkExpandResponse> expandWithResponse(
         }
     }
 
+    public BookmarkExpandResponse expand(
+        String resourceGroupName, String workspaceName, String bookmarkId, BookmarkExpandParameters parameters) {
+        BookmarkExpandResponseInner inner =
+            this.serviceClient().expand(resourceGroupName, workspaceName, bookmarkId, parameters);
+        if (inner != null) {
+            return new BookmarkExpandResponseImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     private BookmarkOperationsClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarkRelationsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarkRelationsClientImpl.java
index f2f214d54a93..12e833ba9d22 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarkRelationsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarkRelationsClientImpl.java
@@ -581,14 +581,16 @@ private Mono<RelationInner> getAsync(
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param relationName Relation Name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a bookmark relation.
+     * @return a bookmark relation along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public RelationInner get(String resourceGroupName, String workspaceName, String bookmarkId, String relationName) {
-        return getAsync(resourceGroupName, workspaceName, bookmarkId, relationName).block();
+    public Response<RelationInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String bookmarkId, String relationName, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, bookmarkId, relationName, context).block();
     }
 
     /**
@@ -598,16 +600,14 @@ public RelationInner get(String resourceGroupName, String workspaceName, String
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param relationName Relation Name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a bookmark relation along with {@link Response}.
+     * @return a bookmark relation.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<RelationInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String bookmarkId, String relationName, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, bookmarkId, relationName, context).block();
+    public RelationInner get(String resourceGroupName, String workspaceName, String bookmarkId, String relationName) {
+        return getWithResponse(resourceGroupName, workspaceName, bookmarkId, relationName, Context.NONE).getValue();
     }
 
     /**
@@ -781,19 +781,23 @@ private Mono<RelationInner> createOrUpdateAsync(
      * @param bookmarkId Bookmark ID.
      * @param relationName Relation Name.
      * @param relation The relation model.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a relation between two resources.
+     * @return represents a relation between two resources along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public RelationInner createOrUpdate(
+    public Response<RelationInner> createOrUpdateWithResponse(
         String resourceGroupName,
         String workspaceName,
         String bookmarkId,
         String relationName,
-        RelationInner relation) {
-        return createOrUpdateAsync(resourceGroupName, workspaceName, bookmarkId, relationName, relation).block();
+        RelationInner relation,
+        Context context) {
+        return createOrUpdateWithResponseAsync(
+                resourceGroupName, workspaceName, bookmarkId, relationName, relation, context)
+            .block();
     }
 
     /**
@@ -804,23 +808,21 @@ public RelationInner createOrUpdate(
      * @param bookmarkId Bookmark ID.
      * @param relationName Relation Name.
      * @param relation The relation model.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a relation between two resources along with {@link Response}.
+     * @return represents a relation between two resources.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<RelationInner> createOrUpdateWithResponse(
+    public RelationInner createOrUpdate(
         String resourceGroupName,
         String workspaceName,
         String bookmarkId,
         String relationName,
-        RelationInner relation,
-        Context context) {
-        return createOrUpdateWithResponseAsync(
-                resourceGroupName, workspaceName, bookmarkId, relationName, relation, context)
-            .block();
+        RelationInner relation) {
+        return createOrUpdateWithResponse(
+                resourceGroupName, workspaceName, bookmarkId, relationName, relation, Context.NONE)
+            .getValue();
     }
 
     /**
@@ -963,13 +965,16 @@ private Mono<Void> deleteAsync(
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param relationName Relation Name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String bookmarkId, String relationName) {
-        deleteAsync(resourceGroupName, workspaceName, bookmarkId, relationName).block();
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String bookmarkId, String relationName, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, bookmarkId, relationName, context).block();
     }
 
     /**
@@ -979,16 +984,13 @@ public void delete(String resourceGroupName, String workspaceName, String bookma
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param relationName Relation Name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String bookmarkId, String relationName, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, bookmarkId, relationName, context).block();
+    public void delete(String resourceGroupName, String workspaceName, String bookmarkId, String relationName) {
+        deleteWithResponse(resourceGroupName, workspaceName, bookmarkId, relationName, Context.NONE);
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarkRelationsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarkRelationsImpl.java
index 0c90dbec0292..33419aa71810 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarkRelationsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarkRelationsImpl.java
@@ -49,15 +49,6 @@ public PagedIterable<Relation> list(
         return Utils.mapPage(inner, inner1 -> new RelationImpl(inner1, this.manager()));
     }
 
-    public Relation get(String resourceGroupName, String workspaceName, String bookmarkId, String relationName) {
-        RelationInner inner = this.serviceClient().get(resourceGroupName, workspaceName, bookmarkId, relationName);
-        if (inner != null) {
-            return new RelationImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<Relation> getWithResponse(
         String resourceGroupName, String workspaceName, String bookmarkId, String relationName, Context context) {
         Response<RelationInner> inner =
@@ -73,8 +64,13 @@ public Response<Relation> getWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String bookmarkId, String relationName) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, bookmarkId, relationName);
+    public Relation get(String resourceGroupName, String workspaceName, String bookmarkId, String relationName) {
+        RelationInner inner = this.serviceClient().get(resourceGroupName, workspaceName, bookmarkId, relationName);
+        if (inner != null) {
+            return new RelationImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -84,6 +80,10 @@ public Response<Void> deleteWithResponse(
             .deleteWithResponse(resourceGroupName, workspaceName, bookmarkId, relationName, context);
     }
 
+    public void delete(String resourceGroupName, String workspaceName, String bookmarkId, String relationName) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, bookmarkId, relationName);
+    }
+
     public Relation getById(String id) {
         String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
         if (resourceGroupName == null) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarksClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarksClientImpl.java
index 4dc36ed754b4..207d815a69c6 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarksClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarksClientImpl.java
@@ -437,14 +437,16 @@ private Mono<BookmarkInner> getAsync(String resourceGroupName, String workspaceN
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a bookmark.
+     * @return a bookmark along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public BookmarkInner get(String resourceGroupName, String workspaceName, String bookmarkId) {
-        return getAsync(resourceGroupName, workspaceName, bookmarkId).block();
+    public Response<BookmarkInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String bookmarkId, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, bookmarkId, context).block();
     }
 
     /**
@@ -453,16 +455,14 @@ public BookmarkInner get(String resourceGroupName, String workspaceName, String
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a bookmark along with {@link Response}.
+     * @return a bookmark.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<BookmarkInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String bookmarkId, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, bookmarkId, context).block();
+    public BookmarkInner get(String resourceGroupName, String workspaceName, String bookmarkId) {
+        return getWithResponse(resourceGroupName, workspaceName, bookmarkId, Context.NONE).getValue();
     }
 
     /**
@@ -611,15 +611,16 @@ private Mono<BookmarkInner> createOrUpdateAsync(
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param bookmark The bookmark.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a bookmark in Azure Security Insights.
+     * @return represents a bookmark in Azure Security Insights along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public BookmarkInner createOrUpdate(
-        String resourceGroupName, String workspaceName, String bookmarkId, BookmarkInner bookmark) {
-        return createOrUpdateAsync(resourceGroupName, workspaceName, bookmarkId, bookmark).block();
+    public Response<BookmarkInner> createOrUpdateWithResponse(
+        String resourceGroupName, String workspaceName, String bookmarkId, BookmarkInner bookmark, Context context) {
+        return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, bookmarkId, bookmark, context).block();
     }
 
     /**
@@ -629,16 +630,16 @@ public BookmarkInner createOrUpdate(
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param bookmark The bookmark.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a bookmark in Azure Security Insights along with {@link Response}.
+     * @return represents a bookmark in Azure Security Insights.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<BookmarkInner> createOrUpdateWithResponse(
-        String resourceGroupName, String workspaceName, String bookmarkId, BookmarkInner bookmark, Context context) {
-        return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, bookmarkId, bookmark, context).block();
+    public BookmarkInner createOrUpdate(
+        String resourceGroupName, String workspaceName, String bookmarkId, BookmarkInner bookmark) {
+        return createOrUpdateWithResponse(resourceGroupName, workspaceName, bookmarkId, bookmark, Context.NONE)
+            .getValue();
     }
 
     /**
@@ -767,13 +768,16 @@ private Mono<Void> deleteAsync(String resourceGroupName, String workspaceName, S
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String bookmarkId) {
-        deleteAsync(resourceGroupName, workspaceName, bookmarkId).block();
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String bookmarkId, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, bookmarkId, context).block();
     }
 
     /**
@@ -782,16 +786,13 @@ public void delete(String resourceGroupName, String workspaceName, String bookma
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String bookmarkId, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, bookmarkId, context).block();
+    public void delete(String resourceGroupName, String workspaceName, String bookmarkId) {
+        deleteWithResponse(resourceGroupName, workspaceName, bookmarkId, Context.NONE);
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarksImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarksImpl.java
index e87053fd5814..bee3f246130b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarksImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/BookmarksImpl.java
@@ -38,15 +38,6 @@ public PagedIterable<Bookmark> list(String resourceGroupName, String workspaceNa
         return Utils.mapPage(inner, inner1 -> new BookmarkImpl(inner1, this.manager()));
     }
 
-    public Bookmark get(String resourceGroupName, String workspaceName, String bookmarkId) {
-        BookmarkInner inner = this.serviceClient().get(resourceGroupName, workspaceName, bookmarkId);
-        if (inner != null) {
-            return new BookmarkImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<Bookmark> getWithResponse(
         String resourceGroupName, String workspaceName, String bookmarkId, Context context) {
         Response<BookmarkInner> inner =
@@ -62,8 +53,13 @@ public Response<Bookmark> getWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String bookmarkId) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, bookmarkId);
+    public Bookmark get(String resourceGroupName, String workspaceName, String bookmarkId) {
+        BookmarkInner inner = this.serviceClient().get(resourceGroupName, workspaceName, bookmarkId);
+        if (inner != null) {
+            return new BookmarkImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -71,6 +67,10 @@ public Response<Void> deleteWithResponse(
         return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, bookmarkId, context);
     }
 
+    public void delete(String resourceGroupName, String workspaceName, String bookmarkId) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, bookmarkId);
+    }
+
     public Bookmark getById(String id) {
         String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
         if (resourceGroupName == null) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DataConnectorsCheckRequirementsOperationsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DataConnectorsCheckRequirementsOperationsClientImpl.java
index b19d22164e89..05db48d9cd5e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DataConnectorsCheckRequirementsOperationsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DataConnectorsCheckRequirementsOperationsClientImpl.java
@@ -225,17 +225,20 @@ private Mono<DataConnectorRequirementsStateInner> postAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorsCheckRequirements The parameters for requirements check message.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return requirements state for a data connector type.
+     * @return requirements state for a data connector type along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public DataConnectorRequirementsStateInner post(
+    public Response<DataConnectorRequirementsStateInner> postWithResponse(
         String resourceGroupName,
         String workspaceName,
-        DataConnectorsCheckRequirements dataConnectorsCheckRequirements) {
-        return postAsync(resourceGroupName, workspaceName, dataConnectorsCheckRequirements).block();
+        DataConnectorsCheckRequirements dataConnectorsCheckRequirements,
+        Context context) {
+        return postWithResponseAsync(resourceGroupName, workspaceName, dataConnectorsCheckRequirements, context)
+            .block();
     }
 
     /**
@@ -244,19 +247,17 @@ public DataConnectorRequirementsStateInner post(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorsCheckRequirements The parameters for requirements check message.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return requirements state for a data connector type along with {@link Response}.
+     * @return requirements state for a data connector type.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<DataConnectorRequirementsStateInner> postWithResponse(
+    public DataConnectorRequirementsStateInner post(
         String resourceGroupName,
         String workspaceName,
-        DataConnectorsCheckRequirements dataConnectorsCheckRequirements,
-        Context context) {
-        return postWithResponseAsync(resourceGroupName, workspaceName, dataConnectorsCheckRequirements, context)
-            .block();
+        DataConnectorsCheckRequirements dataConnectorsCheckRequirements) {
+        return postWithResponse(resourceGroupName, workspaceName, dataConnectorsCheckRequirements, Context.NONE)
+            .getValue();
     }
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DataConnectorsCheckRequirementsOperationsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DataConnectorsCheckRequirementsOperationsImpl.java
index 1c97eca6aff9..1fd098ffe948 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DataConnectorsCheckRequirementsOperationsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DataConnectorsCheckRequirementsOperationsImpl.java
@@ -28,19 +28,6 @@ public DataConnectorsCheckRequirementsOperationsImpl(
         this.serviceManager = serviceManager;
     }
 
-    public DataConnectorRequirementsState post(
-        String resourceGroupName,
-        String workspaceName,
-        DataConnectorsCheckRequirements dataConnectorsCheckRequirements) {
-        DataConnectorRequirementsStateInner inner =
-            this.serviceClient().post(resourceGroupName, workspaceName, dataConnectorsCheckRequirements);
-        if (inner != null) {
-            return new DataConnectorRequirementsStateImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<DataConnectorRequirementsState> postWithResponse(
         String resourceGroupName,
         String workspaceName,
@@ -61,6 +48,19 @@ public Response<DataConnectorRequirementsState> postWithResponse(
         }
     }
 
+    public DataConnectorRequirementsState post(
+        String resourceGroupName,
+        String workspaceName,
+        DataConnectorsCheckRequirements dataConnectorsCheckRequirements) {
+        DataConnectorRequirementsStateInner inner =
+            this.serviceClient().post(resourceGroupName, workspaceName, dataConnectorsCheckRequirements);
+        if (inner != null) {
+            return new DataConnectorRequirementsStateImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     private DataConnectorsCheckRequirementsOperationsClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DataConnectorsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DataConnectorsClientImpl.java
index 1a58d841aa80..72861b218ccf 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DataConnectorsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DataConnectorsClientImpl.java
@@ -477,14 +477,16 @@ private Mono<DataConnectorInner> getAsync(String resourceGroupName, String works
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a data connector.
+     * @return a data connector along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public DataConnectorInner get(String resourceGroupName, String workspaceName, String dataConnectorId) {
-        return getAsync(resourceGroupName, workspaceName, dataConnectorId).block();
+    public Response<DataConnectorInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String dataConnectorId, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, dataConnectorId, context).block();
     }
 
     /**
@@ -493,16 +495,14 @@ public DataConnectorInner get(String resourceGroupName, String workspaceName, St
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a data connector along with {@link Response}.
+     * @return a data connector.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<DataConnectorInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String dataConnectorId, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, dataConnectorId, context).block();
+    public DataConnectorInner get(String resourceGroupName, String workspaceName, String dataConnectorId) {
+        return getWithResponse(resourceGroupName, workspaceName, dataConnectorId, Context.NONE).getValue();
     }
 
     /**
@@ -655,15 +655,22 @@ private Mono<DataConnectorInner> createOrUpdateAsync(
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
      * @param dataConnector The data connector.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return data connector.
+     * @return data connector along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public DataConnectorInner createOrUpdate(
-        String resourceGroupName, String workspaceName, String dataConnectorId, DataConnectorInner dataConnector) {
-        return createOrUpdateAsync(resourceGroupName, workspaceName, dataConnectorId, dataConnector).block();
+    public Response<DataConnectorInner> createOrUpdateWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String dataConnectorId,
+        DataConnectorInner dataConnector,
+        Context context) {
+        return createOrUpdateWithResponseAsync(
+                resourceGroupName, workspaceName, dataConnectorId, dataConnector, context)
+            .block();
     }
 
     /**
@@ -673,22 +680,17 @@ public DataConnectorInner createOrUpdate(
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
      * @param dataConnector The data connector.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return data connector along with {@link Response}.
+     * @return data connector.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<DataConnectorInner> createOrUpdateWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String dataConnectorId,
-        DataConnectorInner dataConnector,
-        Context context) {
-        return createOrUpdateWithResponseAsync(
-                resourceGroupName, workspaceName, dataConnectorId, dataConnector, context)
-            .block();
+    public DataConnectorInner createOrUpdate(
+        String resourceGroupName, String workspaceName, String dataConnectorId, DataConnectorInner dataConnector) {
+        return createOrUpdateWithResponse(
+                resourceGroupName, workspaceName, dataConnectorId, dataConnector, Context.NONE)
+            .getValue();
     }
 
     /**
@@ -820,13 +822,16 @@ private Mono<Void> deleteAsync(String resourceGroupName, String workspaceName, S
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String dataConnectorId) {
-        deleteAsync(resourceGroupName, workspaceName, dataConnectorId).block();
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String dataConnectorId, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, dataConnectorId, context).block();
     }
 
     /**
@@ -835,16 +840,13 @@ public void delete(String resourceGroupName, String workspaceName, String dataCo
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String dataConnectorId, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, dataConnectorId, context).block();
+    public void delete(String resourceGroupName, String workspaceName, String dataConnectorId) {
+        deleteWithResponse(resourceGroupName, workspaceName, dataConnectorId, Context.NONE);
     }
 
     /**
@@ -997,14 +999,21 @@ private Mono<Void> connectAsync(
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
      * @param connectBody The data connector.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void connect(
-        String resourceGroupName, String workspaceName, String dataConnectorId, DataConnectorConnectBody connectBody) {
-        connectAsync(resourceGroupName, workspaceName, dataConnectorId, connectBody).block();
+    public Response<Void> connectWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String dataConnectorId,
+        DataConnectorConnectBody connectBody,
+        Context context) {
+        return connectWithResponseAsync(resourceGroupName, workspaceName, dataConnectorId, connectBody, context)
+            .block();
     }
 
     /**
@@ -1014,21 +1023,14 @@ public void connect(
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
      * @param connectBody The data connector.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> connectWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String dataConnectorId,
-        DataConnectorConnectBody connectBody,
-        Context context) {
-        return connectWithResponseAsync(resourceGroupName, workspaceName, dataConnectorId, connectBody, context)
-            .block();
+    public void connect(
+        String resourceGroupName, String workspaceName, String dataConnectorId, DataConnectorConnectBody connectBody) {
+        connectWithResponse(resourceGroupName, workspaceName, dataConnectorId, connectBody, Context.NONE);
     }
 
     /**
@@ -1160,13 +1162,16 @@ private Mono<Void> disconnectAsync(String resourceGroupName, String workspaceNam
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void disconnect(String resourceGroupName, String workspaceName, String dataConnectorId) {
-        disconnectAsync(resourceGroupName, workspaceName, dataConnectorId).block();
+    public Response<Void> disconnectWithResponse(
+        String resourceGroupName, String workspaceName, String dataConnectorId, Context context) {
+        return disconnectWithResponseAsync(resourceGroupName, workspaceName, dataConnectorId, context).block();
     }
 
     /**
@@ -1175,16 +1180,13 @@ public void disconnect(String resourceGroupName, String workspaceName, String da
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> disconnectWithResponse(
-        String resourceGroupName, String workspaceName, String dataConnectorId, Context context) {
-        return disconnectWithResponseAsync(resourceGroupName, workspaceName, dataConnectorId, context).block();
+    public void disconnect(String resourceGroupName, String workspaceName, String dataConnectorId) {
+        disconnectWithResponse(resourceGroupName, workspaceName, dataConnectorId, Context.NONE);
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DataConnectorsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DataConnectorsImpl.java
index 33b8c30d1247..008475aab81f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DataConnectorsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DataConnectorsImpl.java
@@ -39,15 +39,6 @@ public PagedIterable<DataConnector> list(String resourceGroupName, String worksp
         return Utils.mapPage(inner, inner1 -> new DataConnectorImpl(inner1, this.manager()));
     }
 
-    public DataConnector get(String resourceGroupName, String workspaceName, String dataConnectorId) {
-        DataConnectorInner inner = this.serviceClient().get(resourceGroupName, workspaceName, dataConnectorId);
-        if (inner != null) {
-            return new DataConnectorImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<DataConnector> getWithResponse(
         String resourceGroupName, String workspaceName, String dataConnectorId, Context context) {
         Response<DataConnectorInner> inner =
@@ -63,10 +54,8 @@ public Response<DataConnector> getWithResponse(
         }
     }
 
-    public DataConnector createOrUpdate(
-        String resourceGroupName, String workspaceName, String dataConnectorId, DataConnectorInner dataConnector) {
-        DataConnectorInner inner =
-            this.serviceClient().createOrUpdate(resourceGroupName, workspaceName, dataConnectorId, dataConnector);
+    public DataConnector get(String resourceGroupName, String workspaceName, String dataConnectorId) {
+        DataConnectorInner inner = this.serviceClient().get(resourceGroupName, workspaceName, dataConnectorId);
         if (inner != null) {
             return new DataConnectorImpl(inner, this.manager());
         } else {
@@ -95,8 +84,15 @@ public Response<DataConnector> createOrUpdateWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String dataConnectorId) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, dataConnectorId);
+    public DataConnector createOrUpdate(
+        String resourceGroupName, String workspaceName, String dataConnectorId, DataConnectorInner dataConnector) {
+        DataConnectorInner inner =
+            this.serviceClient().createOrUpdate(resourceGroupName, workspaceName, dataConnectorId, dataConnector);
+        if (inner != null) {
+            return new DataConnectorImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -104,9 +100,8 @@ public Response<Void> deleteWithResponse(
         return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, dataConnectorId, context);
     }
 
-    public void connect(
-        String resourceGroupName, String workspaceName, String dataConnectorId, DataConnectorConnectBody connectBody) {
-        this.serviceClient().connect(resourceGroupName, workspaceName, dataConnectorId, connectBody);
+    public void delete(String resourceGroupName, String workspaceName, String dataConnectorId) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, dataConnectorId);
     }
 
     public Response<Void> connectWithResponse(
@@ -120,8 +115,9 @@ public Response<Void> connectWithResponse(
             .connectWithResponse(resourceGroupName, workspaceName, dataConnectorId, connectBody, context);
     }
 
-    public void disconnect(String resourceGroupName, String workspaceName, String dataConnectorId) {
-        this.serviceClient().disconnect(resourceGroupName, workspaceName, dataConnectorId);
+    public void connect(
+        String resourceGroupName, String workspaceName, String dataConnectorId, DataConnectorConnectBody connectBody) {
+        this.serviceClient().connect(resourceGroupName, workspaceName, dataConnectorId, connectBody);
     }
 
     public Response<Void> disconnectWithResponse(
@@ -129,6 +125,10 @@ public Response<Void> disconnectWithResponse(
         return this.serviceClient().disconnectWithResponse(resourceGroupName, workspaceName, dataConnectorId, context);
     }
 
+    public void disconnect(String resourceGroupName, String workspaceName, String dataConnectorId) {
+        this.serviceClient().disconnect(resourceGroupName, workspaceName, dataConnectorId);
+    }
+
     private DataConnectorsClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DomainWhoisClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DomainWhoisClientImpl.java
index 918c289e473c..ac462fca718a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DomainWhoisClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DomainWhoisClientImpl.java
@@ -182,14 +182,16 @@ private Mono<EnrichmentDomainWhoisInner> getAsync(String resourceGroupName, Stri
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param domain Domain name to be enriched.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return whois information for a single domain name.
+     * @return whois information for a single domain name along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public EnrichmentDomainWhoisInner get(String resourceGroupName, String domain) {
-        return getAsync(resourceGroupName, domain).block();
+    public Response<EnrichmentDomainWhoisInner> getWithResponse(
+        String resourceGroupName, String domain, Context context) {
+        return getWithResponseAsync(resourceGroupName, domain, context).block();
     }
 
     /**
@@ -197,15 +199,13 @@ public EnrichmentDomainWhoisInner get(String resourceGroupName, String domain) {
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param domain Domain name to be enriched.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return whois information for a single domain name along with {@link Response}.
+     * @return whois information for a single domain name.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<EnrichmentDomainWhoisInner> getWithResponse(
-        String resourceGroupName, String domain, Context context) {
-        return getWithResponseAsync(resourceGroupName, domain, context).block();
+    public EnrichmentDomainWhoisInner get(String resourceGroupName, String domain) {
+        return getWithResponse(resourceGroupName, domain, Context.NONE).getValue();
     }
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DomainWhoisImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DomainWhoisImpl.java
index be9939f6abc0..0dc778c7e8e6 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DomainWhoisImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/DomainWhoisImpl.java
@@ -27,15 +27,6 @@ public DomainWhoisImpl(
         this.serviceManager = serviceManager;
     }
 
-    public EnrichmentDomainWhois get(String resourceGroupName, String domain) {
-        EnrichmentDomainWhoisInner inner = this.serviceClient().get(resourceGroupName, domain);
-        if (inner != null) {
-            return new EnrichmentDomainWhoisImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<EnrichmentDomainWhois> getWithResponse(String resourceGroupName, String domain, Context context) {
         Response<EnrichmentDomainWhoisInner> inner =
             this.serviceClient().getWithResponse(resourceGroupName, domain, context);
@@ -50,6 +41,15 @@ public Response<EnrichmentDomainWhois> getWithResponse(String resourceGroupName,
         }
     }
 
+    public EnrichmentDomainWhois get(String resourceGroupName, String domain) {
+        EnrichmentDomainWhoisInner inner = this.serviceClient().get(resourceGroupName, domain);
+        if (inner != null) {
+            return new EnrichmentDomainWhoisImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     private DomainWhoisClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntitiesClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntitiesClientImpl.java
index f9c1c922a5b4..9bdc5eaacbde 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntitiesClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntitiesClientImpl.java
@@ -459,14 +459,16 @@ private Mono<EntityInner> getAsync(String resourceGroupName, String workspaceNam
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity.
+     * @return an entity along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public EntityInner get(String resourceGroupName, String workspaceName, String entityId) {
-        return getAsync(resourceGroupName, workspaceName, entityId).block();
+    public Response<EntityInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String entityId, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, entityId, context).block();
     }
 
     /**
@@ -475,16 +477,14 @@ public EntityInner get(String resourceGroupName, String workspaceName, String en
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity along with {@link Response}.
+     * @return an entity.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<EntityInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String entityId, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, entityId, context).block();
+    public EntityInner get(String resourceGroupName, String workspaceName, String entityId) {
+        return getWithResponse(resourceGroupName, workspaceName, entityId, Context.NONE).getValue();
     }
 
     /**
@@ -637,15 +637,20 @@ private Mono<EntityExpandResponseInner> expandAsync(
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param parameters The parameters required to execute an expand operation on the given entity.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the entity expansion result operation response.
+     * @return the entity expansion result operation response along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public EntityExpandResponseInner expand(
-        String resourceGroupName, String workspaceName, String entityId, EntityExpandParameters parameters) {
-        return expandAsync(resourceGroupName, workspaceName, entityId, parameters).block();
+    public Response<EntityExpandResponseInner> expandWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String entityId,
+        EntityExpandParameters parameters,
+        Context context) {
+        return expandWithResponseAsync(resourceGroupName, workspaceName, entityId, parameters, context).block();
     }
 
     /**
@@ -655,20 +660,15 @@ public EntityExpandResponseInner expand(
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param parameters The parameters required to execute an expand operation on the given entity.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the entity expansion result operation response along with {@link Response}.
+     * @return the entity expansion result operation response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<EntityExpandResponseInner> expandWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String entityId,
-        EntityExpandParameters parameters,
-        Context context) {
-        return expandWithResponseAsync(resourceGroupName, workspaceName, entityId, parameters, context).block();
+    public EntityExpandResponseInner expand(
+        String resourceGroupName, String workspaceName, String entityId, EntityExpandParameters parameters) {
+        return expandWithResponse(resourceGroupName, workspaceName, entityId, parameters, Context.NONE).getValue();
     }
 
     /**
@@ -813,15 +813,16 @@ private Mono<GetQueriesResponseInner> queriesAsync(
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param kind The Kind parameter for queries.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return insights and Activities for an entity.
+     * @return insights and Activities for an entity along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public GetQueriesResponseInner queries(
-        String resourceGroupName, String workspaceName, String entityId, EntityItemQueryKind kind) {
-        return queriesAsync(resourceGroupName, workspaceName, entityId, kind).block();
+    public Response<GetQueriesResponseInner> queriesWithResponse(
+        String resourceGroupName, String workspaceName, String entityId, EntityItemQueryKind kind, Context context) {
+        return queriesWithResponseAsync(resourceGroupName, workspaceName, entityId, kind, context).block();
     }
 
     /**
@@ -831,16 +832,15 @@ public GetQueriesResponseInner queries(
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param kind The Kind parameter for queries.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return insights and Activities for an entity along with {@link Response}.
+     * @return insights and Activities for an entity.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<GetQueriesResponseInner> queriesWithResponse(
-        String resourceGroupName, String workspaceName, String entityId, EntityItemQueryKind kind, Context context) {
-        return queriesWithResponseAsync(resourceGroupName, workspaceName, entityId, kind, context).block();
+    public GetQueriesResponseInner queries(
+        String resourceGroupName, String workspaceName, String entityId, EntityItemQueryKind kind) {
+        return queriesWithResponse(resourceGroupName, workspaceName, entityId, kind, Context.NONE).getValue();
     }
 
     /**
@@ -993,15 +993,20 @@ private Mono<EntityGetInsightsResponseInner> getInsightsAsync(
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param parameters The parameters required to execute insights on the given entity.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Get Insights result operation response.
+     * @return the Get Insights result operation response along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public EntityGetInsightsResponseInner getInsights(
-        String resourceGroupName, String workspaceName, String entityId, EntityGetInsightsParameters parameters) {
-        return getInsightsAsync(resourceGroupName, workspaceName, entityId, parameters).block();
+    public Response<EntityGetInsightsResponseInner> getInsightsWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String entityId,
+        EntityGetInsightsParameters parameters,
+        Context context) {
+        return getInsightsWithResponseAsync(resourceGroupName, workspaceName, entityId, parameters, context).block();
     }
 
     /**
@@ -1011,20 +1016,15 @@ public EntityGetInsightsResponseInner getInsights(
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param parameters The parameters required to execute insights on the given entity.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Get Insights result operation response along with {@link Response}.
+     * @return the Get Insights result operation response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<EntityGetInsightsResponseInner> getInsightsWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String entityId,
-        EntityGetInsightsParameters parameters,
-        Context context) {
-        return getInsightsWithResponseAsync(resourceGroupName, workspaceName, entityId, parameters, context).block();
+    public EntityGetInsightsResponseInner getInsights(
+        String resourceGroupName, String workspaceName, String entityId, EntityGetInsightsParameters parameters) {
+        return getInsightsWithResponse(resourceGroupName, workspaceName, entityId, parameters, Context.NONE).getValue();
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntitiesGetTimelinesClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntitiesGetTimelinesClientImpl.java
index f2cffddbe566..7a2937f5cbd7 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntitiesGetTimelinesClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntitiesGetTimelinesClientImpl.java
@@ -222,15 +222,20 @@ private Mono<EntityTimelineResponseInner> listAsync(
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param parameters The parameters required to execute an timeline operation on the given entity.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the entity timeline result operation response.
+     * @return the entity timeline result operation response along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public EntityTimelineResponseInner list(
-        String resourceGroupName, String workspaceName, String entityId, EntityTimelineParameters parameters) {
-        return listAsync(resourceGroupName, workspaceName, entityId, parameters).block();
+    public Response<EntityTimelineResponseInner> listWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String entityId,
+        EntityTimelineParameters parameters,
+        Context context) {
+        return listWithResponseAsync(resourceGroupName, workspaceName, entityId, parameters, context).block();
     }
 
     /**
@@ -240,19 +245,14 @@ public EntityTimelineResponseInner list(
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param parameters The parameters required to execute an timeline operation on the given entity.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the entity timeline result operation response along with {@link Response}.
+     * @return the entity timeline result operation response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<EntityTimelineResponseInner> listWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String entityId,
-        EntityTimelineParameters parameters,
-        Context context) {
-        return listWithResponseAsync(resourceGroupName, workspaceName, entityId, parameters, context).block();
+    public EntityTimelineResponseInner list(
+        String resourceGroupName, String workspaceName, String entityId, EntityTimelineParameters parameters) {
+        return listWithResponse(resourceGroupName, workspaceName, entityId, parameters, Context.NONE).getValue();
     }
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntitiesGetTimelinesImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntitiesGetTimelinesImpl.java
index 79b119a109c9..6105bb0e4cf5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntitiesGetTimelinesImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntitiesGetTimelinesImpl.java
@@ -28,17 +28,6 @@ public EntitiesGetTimelinesImpl(
         this.serviceManager = serviceManager;
     }
 
-    public EntityTimelineResponse list(
-        String resourceGroupName, String workspaceName, String entityId, EntityTimelineParameters parameters) {
-        EntityTimelineResponseInner inner =
-            this.serviceClient().list(resourceGroupName, workspaceName, entityId, parameters);
-        if (inner != null) {
-            return new EntityTimelineResponseImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<EntityTimelineResponse> listWithResponse(
         String resourceGroupName,
         String workspaceName,
@@ -58,6 +47,17 @@ public Response<EntityTimelineResponse> listWithResponse(
         }
     }
 
+    public EntityTimelineResponse list(
+        String resourceGroupName, String workspaceName, String entityId, EntityTimelineParameters parameters) {
+        EntityTimelineResponseInner inner =
+            this.serviceClient().list(resourceGroupName, workspaceName, entityId, parameters);
+        if (inner != null) {
+            return new EntityTimelineResponseImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     private EntitiesGetTimelinesClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntitiesImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntitiesImpl.java
index 6ce063fd52fe..68d9e730d10e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntitiesImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntitiesImpl.java
@@ -46,15 +46,6 @@ public PagedIterable<Entity> list(String resourceGroupName, String workspaceName
         return Utils.mapPage(inner, inner1 -> new EntityImpl(inner1, this.manager()));
     }
 
-    public Entity get(String resourceGroupName, String workspaceName, String entityId) {
-        EntityInner inner = this.serviceClient().get(resourceGroupName, workspaceName, entityId);
-        if (inner != null) {
-            return new EntityImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<Entity> getWithResponse(
         String resourceGroupName, String workspaceName, String entityId, Context context) {
         Response<EntityInner> inner =
@@ -70,12 +61,10 @@ public Response<Entity> getWithResponse(
         }
     }
 
-    public EntityExpandResponse expand(
-        String resourceGroupName, String workspaceName, String entityId, EntityExpandParameters parameters) {
-        EntityExpandResponseInner inner =
-            this.serviceClient().expand(resourceGroupName, workspaceName, entityId, parameters);
+    public Entity get(String resourceGroupName, String workspaceName, String entityId) {
+        EntityInner inner = this.serviceClient().get(resourceGroupName, workspaceName, entityId);
         if (inner != null) {
-            return new EntityExpandResponseImpl(inner, this.manager());
+            return new EntityImpl(inner, this.manager());
         } else {
             return null;
         }
@@ -100,11 +89,12 @@ public Response<EntityExpandResponse> expandWithResponse(
         }
     }
 
-    public GetQueriesResponse queries(
-        String resourceGroupName, String workspaceName, String entityId, EntityItemQueryKind kind) {
-        GetQueriesResponseInner inner = this.serviceClient().queries(resourceGroupName, workspaceName, entityId, kind);
+    public EntityExpandResponse expand(
+        String resourceGroupName, String workspaceName, String entityId, EntityExpandParameters parameters) {
+        EntityExpandResponseInner inner =
+            this.serviceClient().expand(resourceGroupName, workspaceName, entityId, parameters);
         if (inner != null) {
-            return new GetQueriesResponseImpl(inner, this.manager());
+            return new EntityExpandResponseImpl(inner, this.manager());
         } else {
             return null;
         }
@@ -125,12 +115,11 @@ public Response<GetQueriesResponse> queriesWithResponse(
         }
     }
 
-    public EntityGetInsightsResponse getInsights(
-        String resourceGroupName, String workspaceName, String entityId, EntityGetInsightsParameters parameters) {
-        EntityGetInsightsResponseInner inner =
-            this.serviceClient().getInsights(resourceGroupName, workspaceName, entityId, parameters);
+    public GetQueriesResponse queries(
+        String resourceGroupName, String workspaceName, String entityId, EntityItemQueryKind kind) {
+        GetQueriesResponseInner inner = this.serviceClient().queries(resourceGroupName, workspaceName, entityId, kind);
         if (inner != null) {
-            return new EntityGetInsightsResponseImpl(inner, this.manager());
+            return new GetQueriesResponseImpl(inner, this.manager());
         } else {
             return null;
         }
@@ -157,6 +146,17 @@ public Response<EntityGetInsightsResponse> getInsightsWithResponse(
         }
     }
 
+    public EntityGetInsightsResponse getInsights(
+        String resourceGroupName, String workspaceName, String entityId, EntityGetInsightsParameters parameters) {
+        EntityGetInsightsResponseInner inner =
+            this.serviceClient().getInsights(resourceGroupName, workspaceName, entityId, parameters);
+        if (inner != null) {
+            return new EntityGetInsightsResponseImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     private EntitiesClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityQueriesClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityQueriesClientImpl.java
index cff5f927a832..1ba5f6d8f208 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityQueriesClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityQueriesClientImpl.java
@@ -471,14 +471,16 @@ private Mono<EntityQueryInner> getAsync(String resourceGroupName, String workspa
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityQueryId entity query ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity query.
+     * @return an entity query along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public EntityQueryInner get(String resourceGroupName, String workspaceName, String entityQueryId) {
-        return getAsync(resourceGroupName, workspaceName, entityQueryId).block();
+    public Response<EntityQueryInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String entityQueryId, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, entityQueryId, context).block();
     }
 
     /**
@@ -487,16 +489,14 @@ public EntityQueryInner get(String resourceGroupName, String workspaceName, Stri
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityQueryId entity query ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity query along with {@link Response}.
+     * @return an entity query.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<EntityQueryInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String entityQueryId, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, entityQueryId, context).block();
+    public EntityQueryInner get(String resourceGroupName, String workspaceName, String entityQueryId) {
+        return getWithResponse(resourceGroupName, workspaceName, entityQueryId, Context.NONE).getValue();
     }
 
     /**
@@ -647,15 +647,21 @@ private Mono<EntityQueryInner> createOrUpdateAsync(
      * @param workspaceName The name of the workspace.
      * @param entityQueryId entity query ID.
      * @param entityQuery The entity query we want to create or update.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return specific entity query.
+     * @return specific entity query along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public EntityQueryInner createOrUpdate(
-        String resourceGroupName, String workspaceName, String entityQueryId, CustomEntityQuery entityQuery) {
-        return createOrUpdateAsync(resourceGroupName, workspaceName, entityQueryId, entityQuery).block();
+    public Response<EntityQueryInner> createOrUpdateWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String entityQueryId,
+        CustomEntityQuery entityQuery,
+        Context context) {
+        return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, entityQueryId, entityQuery, context)
+            .block();
     }
 
     /**
@@ -665,21 +671,16 @@ public EntityQueryInner createOrUpdate(
      * @param workspaceName The name of the workspace.
      * @param entityQueryId entity query ID.
      * @param entityQuery The entity query we want to create or update.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return specific entity query along with {@link Response}.
+     * @return specific entity query.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<EntityQueryInner> createOrUpdateWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String entityQueryId,
-        CustomEntityQuery entityQuery,
-        Context context) {
-        return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, entityQueryId, entityQuery, context)
-            .block();
+    public EntityQueryInner createOrUpdate(
+        String resourceGroupName, String workspaceName, String entityQueryId, CustomEntityQuery entityQuery) {
+        return createOrUpdateWithResponse(resourceGroupName, workspaceName, entityQueryId, entityQuery, Context.NONE)
+            .getValue();
     }
 
     /**
@@ -809,13 +810,16 @@ private Mono<Void> deleteAsync(String resourceGroupName, String workspaceName, S
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityQueryId entity query ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String entityQueryId) {
-        deleteAsync(resourceGroupName, workspaceName, entityQueryId).block();
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String entityQueryId, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, entityQueryId, context).block();
     }
 
     /**
@@ -824,16 +828,13 @@ public void delete(String resourceGroupName, String workspaceName, String entity
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityQueryId entity query ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String entityQueryId, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, entityQueryId, context).block();
+    public void delete(String resourceGroupName, String workspaceName, String entityQueryId) {
+        deleteWithResponse(resourceGroupName, workspaceName, entityQueryId, Context.NONE);
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityQueriesImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityQueriesImpl.java
index 66f6d4fb5322..a321db1a93e5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityQueriesImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityQueriesImpl.java
@@ -42,15 +42,6 @@ public PagedIterable<EntityQuery> list(
         return Utils.mapPage(inner, inner1 -> new EntityQueryImpl(inner1, this.manager()));
     }
 
-    public EntityQuery get(String resourceGroupName, String workspaceName, String entityQueryId) {
-        EntityQueryInner inner = this.serviceClient().get(resourceGroupName, workspaceName, entityQueryId);
-        if (inner != null) {
-            return new EntityQueryImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<EntityQuery> getWithResponse(
         String resourceGroupName, String workspaceName, String entityQueryId, Context context) {
         Response<EntityQueryInner> inner =
@@ -66,10 +57,8 @@ public Response<EntityQuery> getWithResponse(
         }
     }
 
-    public EntityQuery createOrUpdate(
-        String resourceGroupName, String workspaceName, String entityQueryId, CustomEntityQuery entityQuery) {
-        EntityQueryInner inner =
-            this.serviceClient().createOrUpdate(resourceGroupName, workspaceName, entityQueryId, entityQuery);
+    public EntityQuery get(String resourceGroupName, String workspaceName, String entityQueryId) {
+        EntityQueryInner inner = this.serviceClient().get(resourceGroupName, workspaceName, entityQueryId);
         if (inner != null) {
             return new EntityQueryImpl(inner, this.manager());
         } else {
@@ -98,8 +87,15 @@ public Response<EntityQuery> createOrUpdateWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String entityQueryId) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, entityQueryId);
+    public EntityQuery createOrUpdate(
+        String resourceGroupName, String workspaceName, String entityQueryId, CustomEntityQuery entityQuery) {
+        EntityQueryInner inner =
+            this.serviceClient().createOrUpdate(resourceGroupName, workspaceName, entityQueryId, entityQuery);
+        if (inner != null) {
+            return new EntityQueryImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -107,6 +103,10 @@ public Response<Void> deleteWithResponse(
         return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, entityQueryId, context);
     }
 
+    public void delete(String resourceGroupName, String workspaceName, String entityQueryId) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, entityQueryId);
+    }
+
     private EntityQueriesClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityQueryTemplatesClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityQueryTemplatesClientImpl.java
index e60bfb3413bf..6f7eeb8ff283 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityQueryTemplatesClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityQueryTemplatesClientImpl.java
@@ -27,7 +27,7 @@
 import com.azure.core.util.FluxUtil;
 import com.azure.resourcemanager.securityinsights.fluent.EntityQueryTemplatesClient;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityQueryTemplateInner;
-import com.azure.resourcemanager.securityinsights.models.Constant88;
+import com.azure.resourcemanager.securityinsights.models.Constant90;
 import com.azure.resourcemanager.securityinsights.models.EntityQueryTemplateList;
 import reactor.core.publisher.Mono;
 
@@ -66,7 +66,7 @@ private interface EntityQueryTemplatesService {
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<EntityQueryTemplateList>> list(
             @HostParam("$host") String endpoint,
-            @QueryParam("kind") Constant88 kind,
+            @QueryParam("kind") Constant90 kind,
             @QueryParam("api-version") String apiVersion,
             @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
@@ -115,7 +115,7 @@ Mono<Response<EntityQueryTemplateList>> listNext(
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<EntityQueryTemplateInner>> listSinglePageAsync(
-        String resourceGroupName, String workspaceName, Constant88 kind) {
+        String resourceGroupName, String workspaceName, Constant90 kind) {
         if (this.client.getEndpoint() == null) {
             return Mono
                 .error(
@@ -175,7 +175,7 @@ private Mono<PagedResponse<EntityQueryTemplateInner>> listSinglePageAsync(
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<EntityQueryTemplateInner>> listSinglePageAsync(
-        String resourceGroupName, String workspaceName, Constant88 kind, Context context) {
+        String resourceGroupName, String workspaceName, Constant90 kind, Context context) {
         if (this.client.getEndpoint() == null) {
             return Mono
                 .error(
@@ -231,7 +231,7 @@ private Mono<PagedResponse<EntityQueryTemplateInner>> listSinglePageAsync(
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<EntityQueryTemplateInner> listAsync(
-        String resourceGroupName, String workspaceName, Constant88 kind) {
+        String resourceGroupName, String workspaceName, Constant90 kind) {
         return new PagedFlux<>(
             () -> listSinglePageAsync(resourceGroupName, workspaceName, kind),
             nextLink -> listNextSinglePageAsync(nextLink));
@@ -249,7 +249,7 @@ private PagedFlux<EntityQueryTemplateInner> listAsync(
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<EntityQueryTemplateInner> listAsync(String resourceGroupName, String workspaceName) {
-        final Constant88 kind = null;
+        final Constant90 kind = null;
         return new PagedFlux<>(
             () -> listSinglePageAsync(resourceGroupName, workspaceName, kind),
             nextLink -> listNextSinglePageAsync(nextLink));
@@ -269,7 +269,7 @@ private PagedFlux<EntityQueryTemplateInner> listAsync(String resourceGroupName,
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<EntityQueryTemplateInner> listAsync(
-        String resourceGroupName, String workspaceName, Constant88 kind, Context context) {
+        String resourceGroupName, String workspaceName, Constant90 kind, Context context) {
         return new PagedFlux<>(
             () -> listSinglePageAsync(resourceGroupName, workspaceName, kind, context),
             nextLink -> listNextSinglePageAsync(nextLink, context));
@@ -287,7 +287,7 @@ private PagedFlux<EntityQueryTemplateInner> listAsync(
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<EntityQueryTemplateInner> list(String resourceGroupName, String workspaceName) {
-        final Constant88 kind = null;
+        final Constant90 kind = null;
         return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, kind));
     }
 
@@ -305,7 +305,7 @@ public PagedIterable<EntityQueryTemplateInner> list(String resourceGroupName, St
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<EntityQueryTemplateInner> list(
-        String resourceGroupName, String workspaceName, Constant88 kind, Context context) {
+        String resourceGroupName, String workspaceName, Constant90 kind, Context context) {
         return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, kind, context));
     }
 
@@ -439,14 +439,16 @@ private Mono<EntityQueryTemplateInner> getAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityQueryTemplateId entity query template ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity query.
+     * @return an entity query along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public EntityQueryTemplateInner get(String resourceGroupName, String workspaceName, String entityQueryTemplateId) {
-        return getAsync(resourceGroupName, workspaceName, entityQueryTemplateId).block();
+    public Response<EntityQueryTemplateInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String entityQueryTemplateId, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, entityQueryTemplateId, context).block();
     }
 
     /**
@@ -455,16 +457,14 @@ public EntityQueryTemplateInner get(String resourceGroupName, String workspaceNa
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityQueryTemplateId entity query template ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity query along with {@link Response}.
+     * @return an entity query.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<EntityQueryTemplateInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String entityQueryTemplateId, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, entityQueryTemplateId, context).block();
+    public EntityQueryTemplateInner get(String resourceGroupName, String workspaceName, String entityQueryTemplateId) {
+        return getWithResponse(resourceGroupName, workspaceName, entityQueryTemplateId, Context.NONE).getValue();
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityQueryTemplatesImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityQueryTemplatesImpl.java
index 040dcb3be9b1..b0eb1e97bb20 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityQueryTemplatesImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityQueryTemplatesImpl.java
@@ -11,7 +11,7 @@
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.securityinsights.fluent.EntityQueryTemplatesClient;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityQueryTemplateInner;
-import com.azure.resourcemanager.securityinsights.models.Constant88;
+import com.azure.resourcemanager.securityinsights.models.Constant90;
 import com.azure.resourcemanager.securityinsights.models.EntityQueryTemplate;
 import com.azure.resourcemanager.securityinsights.models.EntityQueryTemplates;
 
@@ -35,22 +35,12 @@ public PagedIterable<EntityQueryTemplate> list(String resourceGroupName, String
     }
 
     public PagedIterable<EntityQueryTemplate> list(
-        String resourceGroupName, String workspaceName, Constant88 kind, Context context) {
+        String resourceGroupName, String workspaceName, Constant90 kind, Context context) {
         PagedIterable<EntityQueryTemplateInner> inner =
             this.serviceClient().list(resourceGroupName, workspaceName, kind, context);
         return Utils.mapPage(inner, inner1 -> new EntityQueryTemplateImpl(inner1, this.manager()));
     }
 
-    public EntityQueryTemplate get(String resourceGroupName, String workspaceName, String entityQueryTemplateId) {
-        EntityQueryTemplateInner inner =
-            this.serviceClient().get(resourceGroupName, workspaceName, entityQueryTemplateId);
-        if (inner != null) {
-            return new EntityQueryTemplateImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<EntityQueryTemplate> getWithResponse(
         String resourceGroupName, String workspaceName, String entityQueryTemplateId, Context context) {
         Response<EntityQueryTemplateInner> inner =
@@ -66,6 +56,16 @@ public Response<EntityQueryTemplate> getWithResponse(
         }
     }
 
+    public EntityQueryTemplate get(String resourceGroupName, String workspaceName, String entityQueryTemplateId) {
+        EntityQueryTemplateInner inner =
+            this.serviceClient().get(resourceGroupName, workspaceName, entityQueryTemplateId);
+        if (inner != null) {
+            return new EntityQueryTemplateImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     private EntityQueryTemplatesClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityRelationsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityRelationsClientImpl.java
index a30ef2467eab..114b577531e0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityRelationsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityRelationsClientImpl.java
@@ -210,15 +210,16 @@ private Mono<RelationInner> getRelationAsync(
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param relationName Relation Name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity relation.
+     * @return an entity relation along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public RelationInner getRelation(
-        String resourceGroupName, String workspaceName, String entityId, String relationName) {
-        return getRelationAsync(resourceGroupName, workspaceName, entityId, relationName).block();
+    public Response<RelationInner> getRelationWithResponse(
+        String resourceGroupName, String workspaceName, String entityId, String relationName, Context context) {
+        return getRelationWithResponseAsync(resourceGroupName, workspaceName, entityId, relationName, context).block();
     }
 
     /**
@@ -228,15 +229,15 @@ public RelationInner getRelation(
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param relationName Relation Name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity relation along with {@link Response}.
+     * @return an entity relation.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<RelationInner> getRelationWithResponse(
-        String resourceGroupName, String workspaceName, String entityId, String relationName, Context context) {
-        return getRelationWithResponseAsync(resourceGroupName, workspaceName, entityId, relationName, context).block();
+    public RelationInner getRelation(
+        String resourceGroupName, String workspaceName, String entityId, String relationName) {
+        return getRelationWithResponse(resourceGroupName, workspaceName, entityId, relationName, Context.NONE)
+            .getValue();
     }
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityRelationsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityRelationsImpl.java
index 6521f11e7b25..b392b56e76b4 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityRelationsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/EntityRelationsImpl.java
@@ -27,16 +27,6 @@ public EntityRelationsImpl(
         this.serviceManager = serviceManager;
     }
 
-    public Relation getRelation(String resourceGroupName, String workspaceName, String entityId, String relationName) {
-        RelationInner inner =
-            this.serviceClient().getRelation(resourceGroupName, workspaceName, entityId, relationName);
-        if (inner != null) {
-            return new RelationImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<Relation> getRelationWithResponse(
         String resourceGroupName, String workspaceName, String entityId, String relationName, Context context) {
         Response<RelationInner> inner =
@@ -54,6 +44,16 @@ public Response<Relation> getRelationWithResponse(
         }
     }
 
+    public Relation getRelation(String resourceGroupName, String workspaceName, String entityId, String relationName) {
+        RelationInner inner =
+            this.serviceClient().getRelation(resourceGroupName, workspaceName, entityId, relationName);
+        if (inner != null) {
+            return new RelationImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     private EntityRelationsClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/FileImportsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/FileImportsClientImpl.java
index 4b6a38958664..d7af70f45cb0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/FileImportsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/FileImportsClientImpl.java
@@ -533,14 +533,16 @@ private Mono<FileImportInner> getAsync(String resourceGroupName, String workspac
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param fileImportId File import ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a file import.
+     * @return a file import along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public FileImportInner get(String resourceGroupName, String workspaceName, String fileImportId) {
-        return getAsync(resourceGroupName, workspaceName, fileImportId).block();
+    public Response<FileImportInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String fileImportId, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, fileImportId, context).block();
     }
 
     /**
@@ -549,16 +551,14 @@ public FileImportInner get(String resourceGroupName, String workspaceName, Strin
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param fileImportId File import ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a file import along with {@link Response}.
+     * @return a file import.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<FileImportInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String fileImportId, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, fileImportId, context).block();
+    public FileImportInner get(String resourceGroupName, String workspaceName, String fileImportId) {
+        return getWithResponse(resourceGroupName, workspaceName, fileImportId, Context.NONE).getValue();
     }
 
     /**
@@ -711,15 +711,20 @@ private Mono<FileImportInner> createAsync(
      * @param workspaceName The name of the workspace.
      * @param fileImportId File import ID.
      * @param fileImport The file import.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a file import in Azure Security Insights.
+     * @return represents a file import in Azure Security Insights along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public FileImportInner create(
-        String resourceGroupName, String workspaceName, String fileImportId, FileImportInner fileImport) {
-        return createAsync(resourceGroupName, workspaceName, fileImportId, fileImport).block();
+    public Response<FileImportInner> createWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String fileImportId,
+        FileImportInner fileImport,
+        Context context) {
+        return createWithResponseAsync(resourceGroupName, workspaceName, fileImportId, fileImport, context).block();
     }
 
     /**
@@ -729,20 +734,15 @@ public FileImportInner create(
      * @param workspaceName The name of the workspace.
      * @param fileImportId File import ID.
      * @param fileImport The file import.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a file import in Azure Security Insights along with {@link Response}.
+     * @return represents a file import in Azure Security Insights.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<FileImportInner> createWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String fileImportId,
-        FileImportInner fileImport,
-        Context context) {
-        return createWithResponseAsync(resourceGroupName, workspaceName, fileImportId, fileImport, context).block();
+    public FileImportInner create(
+        String resourceGroupName, String workspaceName, String fileImportId, FileImportInner fileImport) {
+        return createWithResponse(resourceGroupName, workspaceName, fileImportId, fileImport, Context.NONE).getValue();
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/FileImportsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/FileImportsImpl.java
index 05175bc230d3..89cfb4e4061b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/FileImportsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/FileImportsImpl.java
@@ -46,15 +46,6 @@ public PagedIterable<FileImport> list(
         return Utils.mapPage(inner, inner1 -> new FileImportImpl(inner1, this.manager()));
     }
 
-    public FileImport get(String resourceGroupName, String workspaceName, String fileImportId) {
-        FileImportInner inner = this.serviceClient().get(resourceGroupName, workspaceName, fileImportId);
-        if (inner != null) {
-            return new FileImportImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<FileImport> getWithResponse(
         String resourceGroupName, String workspaceName, String fileImportId, Context context) {
         Response<FileImportInner> inner =
@@ -70,6 +61,15 @@ public Response<FileImport> getWithResponse(
         }
     }
 
+    public FileImport get(String resourceGroupName, String workspaceName, String fileImportId) {
+        FileImportInner inner = this.serviceClient().get(resourceGroupName, workspaceName, fileImportId);
+        if (inner != null) {
+            return new FileImportImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     public FileImport delete(String resourceGroupName, String workspaceName, String fileImportId) {
         FileImportInner inner = this.serviceClient().delete(resourceGroupName, workspaceName, fileImportId);
         if (inner != null) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentCommentsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentCommentsClientImpl.java
index 5c20f86fb992..2fc22289ca5b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentCommentsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentCommentsClientImpl.java
@@ -584,15 +584,16 @@ private Mono<IncidentCommentInner> getAsync(
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param incidentCommentId Incident comment ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an incident comment.
+     * @return an incident comment along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public IncidentCommentInner get(
-        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId) {
-        return getAsync(resourceGroupName, workspaceName, incidentId, incidentCommentId).block();
+    public Response<IncidentCommentInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, incidentId, incidentCommentId, context).block();
     }
 
     /**
@@ -602,16 +603,16 @@ public IncidentCommentInner get(
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param incidentCommentId Incident comment ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an incident comment along with {@link Response}.
+     * @return an incident comment.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<IncidentCommentInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, incidentId, incidentCommentId, context).block();
+    public IncidentCommentInner get(
+        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId) {
+        return getWithResponse(resourceGroupName, workspaceName, incidentId, incidentCommentId, Context.NONE)
+            .getValue();
     }
 
     /**
@@ -788,19 +789,22 @@ private Mono<IncidentCommentInner> createOrUpdateAsync(
      * @param incidentId Incident ID.
      * @param incidentCommentId Incident comment ID.
      * @param incidentComment The incident comment.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents an incident comment.
+     * @return represents an incident comment along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public IncidentCommentInner createOrUpdate(
+    public Response<IncidentCommentInner> createOrUpdateWithResponse(
         String resourceGroupName,
         String workspaceName,
         String incidentId,
         String incidentCommentId,
-        IncidentCommentInner incidentComment) {
-        return createOrUpdateAsync(resourceGroupName, workspaceName, incidentId, incidentCommentId, incidentComment)
+        IncidentCommentInner incidentComment,
+        Context context) {
+        return createOrUpdateWithResponseAsync(
+                resourceGroupName, workspaceName, incidentId, incidentCommentId, incidentComment, context)
             .block();
     }
 
@@ -812,23 +816,21 @@ public IncidentCommentInner createOrUpdate(
      * @param incidentId Incident ID.
      * @param incidentCommentId Incident comment ID.
      * @param incidentComment The incident comment.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents an incident comment along with {@link Response}.
+     * @return represents an incident comment.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<IncidentCommentInner> createOrUpdateWithResponse(
+    public IncidentCommentInner createOrUpdate(
         String resourceGroupName,
         String workspaceName,
         String incidentId,
         String incidentCommentId,
-        IncidentCommentInner incidentComment,
-        Context context) {
-        return createOrUpdateWithResponseAsync(
-                resourceGroupName, workspaceName, incidentId, incidentCommentId, incidentComment, context)
-            .block();
+        IncidentCommentInner incidentComment) {
+        return createOrUpdateWithResponse(
+                resourceGroupName, workspaceName, incidentId, incidentCommentId, incidentComment, Context.NONE)
+            .getValue();
     }
 
     /**
@@ -973,13 +975,17 @@ private Mono<Void> deleteAsync(
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param incidentCommentId Incident comment ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId) {
-        deleteAsync(resourceGroupName, workspaceName, incidentId, incidentCommentId).block();
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, incidentId, incidentCommentId, context)
+            .block();
     }
 
     /**
@@ -989,17 +995,13 @@ public void delete(String resourceGroupName, String workspaceName, String incide
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param incidentCommentId Incident comment ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, incidentId, incidentCommentId, context)
-            .block();
+    public void delete(String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId) {
+        deleteWithResponse(resourceGroupName, workspaceName, incidentId, incidentCommentId, Context.NONE);
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentCommentsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentCommentsImpl.java
index 8092ca8833a5..61cc928437c5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentCommentsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentCommentsImpl.java
@@ -50,17 +50,6 @@ public PagedIterable<IncidentComment> list(
         return Utils.mapPage(inner, inner1 -> new IncidentCommentImpl(inner1, this.manager()));
     }
 
-    public IncidentComment get(
-        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId) {
-        IncidentCommentInner inner =
-            this.serviceClient().get(resourceGroupName, workspaceName, incidentId, incidentCommentId);
-        if (inner != null) {
-            return new IncidentCommentImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<IncidentComment> getWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId, Context context) {
         Response<IncidentCommentInner> inner =
@@ -78,8 +67,15 @@ public Response<IncidentComment> getWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, incidentId, incidentCommentId);
+    public IncidentComment get(
+        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId) {
+        IncidentCommentInner inner =
+            this.serviceClient().get(resourceGroupName, workspaceName, incidentId, incidentCommentId);
+        if (inner != null) {
+            return new IncidentCommentImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -89,6 +85,10 @@ public Response<Void> deleteWithResponse(
             .deleteWithResponse(resourceGroupName, workspaceName, incidentId, incidentCommentId, context);
     }
 
+    public void delete(String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, incidentId, incidentCommentId);
+    }
+
     public IncidentComment getById(String id) {
         String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
         if (resourceGroupName == null) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentImpl.java
index d9c394639227..b3fa935afd13 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentImpl.java
@@ -251,26 +251,22 @@ public Incident refresh(Context context) {
         return this;
     }
 
-    public TeamInformation createTeam(TeamProperties teamProperties) {
-        return serviceManager.incidents().createTeam(resourceGroupName, workspaceName, incidentId, teamProperties);
-    }
-
     public Response<TeamInformation> createTeamWithResponse(TeamProperties teamProperties, Context context) {
         return serviceManager
             .incidents()
             .createTeamWithResponse(resourceGroupName, workspaceName, incidentId, teamProperties, context);
     }
 
-    public IncidentAlertList listAlerts() {
-        return serviceManager.incidents().listAlerts(resourceGroupName, workspaceName, incidentId);
+    public TeamInformation createTeam(TeamProperties teamProperties) {
+        return serviceManager.incidents().createTeam(resourceGroupName, workspaceName, incidentId, teamProperties);
     }
 
     public Response<IncidentAlertList> listAlertsWithResponse(Context context) {
         return serviceManager.incidents().listAlertsWithResponse(resourceGroupName, workspaceName, incidentId, context);
     }
 
-    public IncidentBookmarkList listBookmarks() {
-        return serviceManager.incidents().listBookmarks(resourceGroupName, workspaceName, incidentId);
+    public IncidentAlertList listAlerts() {
+        return serviceManager.incidents().listAlerts(resourceGroupName, workspaceName, incidentId);
     }
 
     public Response<IncidentBookmarkList> listBookmarksWithResponse(Context context) {
@@ -279,8 +275,8 @@ public Response<IncidentBookmarkList> listBookmarksWithResponse(Context context)
             .listBookmarksWithResponse(resourceGroupName, workspaceName, incidentId, context);
     }
 
-    public IncidentEntitiesResponse listEntities() {
-        return serviceManager.incidents().listEntities(resourceGroupName, workspaceName, incidentId);
+    public IncidentBookmarkList listBookmarks() {
+        return serviceManager.incidents().listBookmarks(resourceGroupName, workspaceName, incidentId);
     }
 
     public Response<IncidentEntitiesResponse> listEntitiesWithResponse(Context context) {
@@ -289,6 +285,10 @@ public Response<IncidentEntitiesResponse> listEntitiesWithResponse(Context conte
             .listEntitiesWithResponse(resourceGroupName, workspaceName, incidentId, context);
     }
 
+    public IncidentEntitiesResponse listEntities() {
+        return serviceManager.incidents().listEntities(resourceGroupName, workspaceName, incidentId);
+    }
+
     public IncidentImpl withEtag(String etag) {
         this.innerModel().withEtag(etag);
         return this;
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentRelationsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentRelationsClientImpl.java
index 2087692a0fbf..8ecf2ff10b96 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentRelationsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentRelationsClientImpl.java
@@ -581,14 +581,16 @@ private Mono<RelationInner> getAsync(
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param relationName Relation Name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an incident relation.
+     * @return an incident relation along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public RelationInner get(String resourceGroupName, String workspaceName, String incidentId, String relationName) {
-        return getAsync(resourceGroupName, workspaceName, incidentId, relationName).block();
+    public Response<RelationInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String incidentId, String relationName, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, incidentId, relationName, context).block();
     }
 
     /**
@@ -598,16 +600,14 @@ public RelationInner get(String resourceGroupName, String workspaceName, String
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param relationName Relation Name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an incident relation along with {@link Response}.
+     * @return an incident relation.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<RelationInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String incidentId, String relationName, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, incidentId, relationName, context).block();
+    public RelationInner get(String resourceGroupName, String workspaceName, String incidentId, String relationName) {
+        return getWithResponse(resourceGroupName, workspaceName, incidentId, relationName, Context.NONE).getValue();
     }
 
     /**
@@ -781,19 +781,23 @@ private Mono<RelationInner> createOrUpdateAsync(
      * @param incidentId Incident ID.
      * @param relationName Relation Name.
      * @param relation The relation model.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a relation between two resources.
+     * @return represents a relation between two resources along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public RelationInner createOrUpdate(
+    public Response<RelationInner> createOrUpdateWithResponse(
         String resourceGroupName,
         String workspaceName,
         String incidentId,
         String relationName,
-        RelationInner relation) {
-        return createOrUpdateAsync(resourceGroupName, workspaceName, incidentId, relationName, relation).block();
+        RelationInner relation,
+        Context context) {
+        return createOrUpdateWithResponseAsync(
+                resourceGroupName, workspaceName, incidentId, relationName, relation, context)
+            .block();
     }
 
     /**
@@ -804,23 +808,21 @@ public RelationInner createOrUpdate(
      * @param incidentId Incident ID.
      * @param relationName Relation Name.
      * @param relation The relation model.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a relation between two resources along with {@link Response}.
+     * @return represents a relation between two resources.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<RelationInner> createOrUpdateWithResponse(
+    public RelationInner createOrUpdate(
         String resourceGroupName,
         String workspaceName,
         String incidentId,
         String relationName,
-        RelationInner relation,
-        Context context) {
-        return createOrUpdateWithResponseAsync(
-                resourceGroupName, workspaceName, incidentId, relationName, relation, context)
-            .block();
+        RelationInner relation) {
+        return createOrUpdateWithResponse(
+                resourceGroupName, workspaceName, incidentId, relationName, relation, Context.NONE)
+            .getValue();
     }
 
     /**
@@ -963,13 +965,16 @@ private Mono<Void> deleteAsync(
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param relationName Relation Name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String incidentId, String relationName) {
-        deleteAsync(resourceGroupName, workspaceName, incidentId, relationName).block();
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String incidentId, String relationName, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, incidentId, relationName, context).block();
     }
 
     /**
@@ -979,16 +984,13 @@ public void delete(String resourceGroupName, String workspaceName, String incide
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param relationName Relation Name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String incidentId, String relationName, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, incidentId, relationName, context).block();
+    public void delete(String resourceGroupName, String workspaceName, String incidentId, String relationName) {
+        deleteWithResponse(resourceGroupName, workspaceName, incidentId, relationName, Context.NONE);
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentRelationsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentRelationsImpl.java
index ae14e641b851..a2457b44bd2f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentRelationsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentRelationsImpl.java
@@ -49,15 +49,6 @@ public PagedIterable<Relation> list(
         return Utils.mapPage(inner, inner1 -> new RelationImpl(inner1, this.manager()));
     }
 
-    public Relation get(String resourceGroupName, String workspaceName, String incidentId, String relationName) {
-        RelationInner inner = this.serviceClient().get(resourceGroupName, workspaceName, incidentId, relationName);
-        if (inner != null) {
-            return new RelationImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<Relation> getWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, String relationName, Context context) {
         Response<RelationInner> inner =
@@ -73,14 +64,8 @@ public Response<Relation> getWithResponse(
         }
     }
 
-    public Relation createOrUpdate(
-        String resourceGroupName,
-        String workspaceName,
-        String incidentId,
-        String relationName,
-        RelationInner relation) {
-        RelationInner inner =
-            this.serviceClient().createOrUpdate(resourceGroupName, workspaceName, incidentId, relationName, relation);
+    public Relation get(String resourceGroupName, String workspaceName, String incidentId, String relationName) {
+        RelationInner inner = this.serviceClient().get(resourceGroupName, workspaceName, incidentId, relationName);
         if (inner != null) {
             return new RelationImpl(inner, this.manager());
         } else {
@@ -111,8 +96,19 @@ public Response<Relation> createOrUpdateWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String incidentId, String relationName) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, incidentId, relationName);
+    public Relation createOrUpdate(
+        String resourceGroupName,
+        String workspaceName,
+        String incidentId,
+        String relationName,
+        RelationInner relation) {
+        RelationInner inner =
+            this.serviceClient().createOrUpdate(resourceGroupName, workspaceName, incidentId, relationName, relation);
+        if (inner != null) {
+            return new RelationImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -122,6 +118,10 @@ public Response<Void> deleteWithResponse(
             .deleteWithResponse(resourceGroupName, workspaceName, incidentId, relationName, context);
     }
 
+    public void delete(String resourceGroupName, String workspaceName, String incidentId, String relationName) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, incidentId, relationName);
+    }
+
     private IncidentRelationsClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentsClientImpl.java
index a07638efa778..2e819cfb599b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentsClientImpl.java
@@ -357,18 +357,14 @@ private Mono<Response<Object>> runPlaybookWithResponseAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentIdentifier The incidentIdentifier parameter.
-     * @param requestBody The requestBody parameter.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return any object on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Object> runPlaybookAsync(
-        String resourceGroupName,
-        String workspaceName,
-        String incidentIdentifier,
-        ManualTriggerRequestBody requestBody) {
+    private Mono<Object> runPlaybookAsync(String resourceGroupName, String workspaceName, String incidentIdentifier) {
+        final ManualTriggerRequestBody requestBody = null;
         return runPlaybookWithResponseAsync(resourceGroupName, workspaceName, incidentIdentifier, requestBody)
             .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
@@ -379,16 +375,22 @@ private Mono<Object> runPlaybookAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentIdentifier The incidentIdentifier parameter.
+     * @param requestBody The requestBody parameter.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return any object on successful completion of {@link Mono}.
+     * @return any object along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Object> runPlaybookAsync(String resourceGroupName, String workspaceName, String incidentIdentifier) {
-        final ManualTriggerRequestBody requestBody = null;
-        return runPlaybookWithResponseAsync(resourceGroupName, workspaceName, incidentIdentifier, requestBody)
-            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    public Response<Object> runPlaybookWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String incidentIdentifier,
+        ManualTriggerRequestBody requestBody,
+        Context context) {
+        return runPlaybookWithResponseAsync(resourceGroupName, workspaceName, incidentIdentifier, requestBody, context)
+            .block();
     }
 
     /**
@@ -405,31 +407,8 @@ private Mono<Object> runPlaybookAsync(String resourceGroupName, String workspace
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Object runPlaybook(String resourceGroupName, String workspaceName, String incidentIdentifier) {
         final ManualTriggerRequestBody requestBody = null;
-        return runPlaybookAsync(resourceGroupName, workspaceName, incidentIdentifier, requestBody).block();
-    }
-
-    /**
-     * Triggers playbook on a specific incident.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param incidentIdentifier The incidentIdentifier parameter.
-     * @param requestBody The requestBody parameter.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return any object along with {@link Response}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Object> runPlaybookWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String incidentIdentifier,
-        ManualTriggerRequestBody requestBody,
-        Context context) {
-        return runPlaybookWithResponseAsync(resourceGroupName, workspaceName, incidentIdentifier, requestBody, context)
-            .block();
+        return runPlaybookWithResponse(resourceGroupName, workspaceName, incidentIdentifier, requestBody, Context.NONE)
+            .getValue();
     }
 
     /**
@@ -822,14 +801,16 @@ private Mono<IncidentInner> getAsync(String resourceGroupName, String workspaceN
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an incident.
+     * @return an incident along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public IncidentInner get(String resourceGroupName, String workspaceName, String incidentId) {
-        return getAsync(resourceGroupName, workspaceName, incidentId).block();
+    public Response<IncidentInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String incidentId, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, incidentId, context).block();
     }
 
     /**
@@ -838,16 +819,14 @@ public IncidentInner get(String resourceGroupName, String workspaceName, String
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an incident along with {@link Response}.
+     * @return an incident.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<IncidentInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String incidentId, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, incidentId, context).block();
+    public IncidentInner get(String resourceGroupName, String workspaceName, String incidentId) {
+        return getWithResponse(resourceGroupName, workspaceName, incidentId, Context.NONE).getValue();
     }
 
     /**
@@ -996,15 +975,16 @@ private Mono<IncidentInner> createOrUpdateAsync(
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param incident The incident.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents an incident in Azure Security Insights.
+     * @return represents an incident in Azure Security Insights along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public IncidentInner createOrUpdate(
-        String resourceGroupName, String workspaceName, String incidentId, IncidentInner incident) {
-        return createOrUpdateAsync(resourceGroupName, workspaceName, incidentId, incident).block();
+    public Response<IncidentInner> createOrUpdateWithResponse(
+        String resourceGroupName, String workspaceName, String incidentId, IncidentInner incident, Context context) {
+        return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, incidentId, incident, context).block();
     }
 
     /**
@@ -1014,16 +994,16 @@ public IncidentInner createOrUpdate(
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param incident The incident.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents an incident in Azure Security Insights along with {@link Response}.
+     * @return represents an incident in Azure Security Insights.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<IncidentInner> createOrUpdateWithResponse(
-        String resourceGroupName, String workspaceName, String incidentId, IncidentInner incident, Context context) {
-        return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, incidentId, incident, context).block();
+    public IncidentInner createOrUpdate(
+        String resourceGroupName, String workspaceName, String incidentId, IncidentInner incident) {
+        return createOrUpdateWithResponse(resourceGroupName, workspaceName, incidentId, incident, Context.NONE)
+            .getValue();
     }
 
     /**
@@ -1152,13 +1132,16 @@ private Mono<Void> deleteAsync(String resourceGroupName, String workspaceName, S
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String incidentId) {
-        deleteAsync(resourceGroupName, workspaceName, incidentId).block();
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String incidentId, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, incidentId, context).block();
     }
 
     /**
@@ -1167,16 +1150,13 @@ public void delete(String resourceGroupName, String workspaceName, String incide
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String incidentId, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, incidentId, context).block();
+    public void delete(String resourceGroupName, String workspaceName, String incidentId) {
+        deleteWithResponse(resourceGroupName, workspaceName, incidentId, Context.NONE);
     }
 
     /**
@@ -1327,15 +1307,21 @@ private Mono<TeamInformationInner> createTeamAsync(
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param teamProperties Team properties.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes team information.
+     * @return describes team information along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public TeamInformationInner createTeam(
-        String resourceGroupName, String workspaceName, String incidentId, TeamProperties teamProperties) {
-        return createTeamAsync(resourceGroupName, workspaceName, incidentId, teamProperties).block();
+    public Response<TeamInformationInner> createTeamWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String incidentId,
+        TeamProperties teamProperties,
+        Context context) {
+        return createTeamWithResponseAsync(resourceGroupName, workspaceName, incidentId, teamProperties, context)
+            .block();
     }
 
     /**
@@ -1345,21 +1331,16 @@ public TeamInformationInner createTeam(
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param teamProperties Team properties.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes team information along with {@link Response}.
+     * @return describes team information.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<TeamInformationInner> createTeamWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String incidentId,
-        TeamProperties teamProperties,
-        Context context) {
-        return createTeamWithResponseAsync(resourceGroupName, workspaceName, incidentId, teamProperties, context)
-            .block();
+    public TeamInformationInner createTeam(
+        String resourceGroupName, String workspaceName, String incidentId, TeamProperties teamProperties) {
+        return createTeamWithResponse(resourceGroupName, workspaceName, incidentId, teamProperties, Context.NONE)
+            .getValue();
     }
 
     /**
@@ -1490,14 +1471,16 @@ private Mono<IncidentAlertListInner> listAlertsAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all incident alerts.
+     * @return all incident alerts along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public IncidentAlertListInner listAlerts(String resourceGroupName, String workspaceName, String incidentId) {
-        return listAlertsAsync(resourceGroupName, workspaceName, incidentId).block();
+    public Response<IncidentAlertListInner> listAlertsWithResponse(
+        String resourceGroupName, String workspaceName, String incidentId, Context context) {
+        return listAlertsWithResponseAsync(resourceGroupName, workspaceName, incidentId, context).block();
     }
 
     /**
@@ -1506,16 +1489,14 @@ public IncidentAlertListInner listAlerts(String resourceGroupName, String worksp
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all incident alerts along with {@link Response}.
+     * @return all incident alerts.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<IncidentAlertListInner> listAlertsWithResponse(
-        String resourceGroupName, String workspaceName, String incidentId, Context context) {
-        return listAlertsWithResponseAsync(resourceGroupName, workspaceName, incidentId, context).block();
+    public IncidentAlertListInner listAlerts(String resourceGroupName, String workspaceName, String incidentId) {
+        return listAlertsWithResponse(resourceGroupName, workspaceName, incidentId, Context.NONE).getValue();
     }
 
     /**
@@ -1646,14 +1627,16 @@ private Mono<IncidentBookmarkListInner> listBookmarksAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all incident bookmarks.
+     * @return all incident bookmarks along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public IncidentBookmarkListInner listBookmarks(String resourceGroupName, String workspaceName, String incidentId) {
-        return listBookmarksAsync(resourceGroupName, workspaceName, incidentId).block();
+    public Response<IncidentBookmarkListInner> listBookmarksWithResponse(
+        String resourceGroupName, String workspaceName, String incidentId, Context context) {
+        return listBookmarksWithResponseAsync(resourceGroupName, workspaceName, incidentId, context).block();
     }
 
     /**
@@ -1662,16 +1645,14 @@ public IncidentBookmarkListInner listBookmarks(String resourceGroupName, String
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all incident bookmarks along with {@link Response}.
+     * @return all incident bookmarks.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<IncidentBookmarkListInner> listBookmarksWithResponse(
-        String resourceGroupName, String workspaceName, String incidentId, Context context) {
-        return listBookmarksWithResponseAsync(resourceGroupName, workspaceName, incidentId, context).block();
+    public IncidentBookmarkListInner listBookmarks(String resourceGroupName, String workspaceName, String incidentId) {
+        return listBookmarksWithResponse(resourceGroupName, workspaceName, incidentId, Context.NONE).getValue();
     }
 
     /**
@@ -1802,15 +1783,16 @@ private Mono<IncidentEntitiesResponseInner> listEntitiesAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all incident related entities.
+     * @return all incident related entities along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public IncidentEntitiesResponseInner listEntities(
-        String resourceGroupName, String workspaceName, String incidentId) {
-        return listEntitiesAsync(resourceGroupName, workspaceName, incidentId).block();
+    public Response<IncidentEntitiesResponseInner> listEntitiesWithResponse(
+        String resourceGroupName, String workspaceName, String incidentId, Context context) {
+        return listEntitiesWithResponseAsync(resourceGroupName, workspaceName, incidentId, context).block();
     }
 
     /**
@@ -1819,16 +1801,15 @@ public IncidentEntitiesResponseInner listEntities(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all incident related entities along with {@link Response}.
+     * @return all incident related entities.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<IncidentEntitiesResponseInner> listEntitiesWithResponse(
-        String resourceGroupName, String workspaceName, String incidentId, Context context) {
-        return listEntitiesWithResponseAsync(resourceGroupName, workspaceName, incidentId, context).block();
+    public IncidentEntitiesResponseInner listEntities(
+        String resourceGroupName, String workspaceName, String incidentId) {
+        return listEntitiesWithResponse(resourceGroupName, workspaceName, incidentId, Context.NONE).getValue();
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentsImpl.java
index a49e1a802a76..8e6cd577d32d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IncidentsImpl.java
@@ -38,10 +38,6 @@ public IncidentsImpl(
         this.serviceManager = serviceManager;
     }
 
-    public Object runPlaybook(String resourceGroupName, String workspaceName, String incidentIdentifier) {
-        return this.serviceClient().runPlaybook(resourceGroupName, workspaceName, incidentIdentifier);
-    }
-
     public Response<Object> runPlaybookWithResponse(
         String resourceGroupName,
         String workspaceName,
@@ -53,6 +49,10 @@ public Response<Object> runPlaybookWithResponse(
             .runPlaybookWithResponse(resourceGroupName, workspaceName, incidentIdentifier, requestBody, context);
     }
 
+    public Object runPlaybook(String resourceGroupName, String workspaceName, String incidentIdentifier) {
+        return this.serviceClient().runPlaybook(resourceGroupName, workspaceName, incidentIdentifier);
+    }
+
     public PagedIterable<Incident> list(String resourceGroupName, String workspaceName) {
         PagedIterable<IncidentInner> inner = this.serviceClient().list(resourceGroupName, workspaceName);
         return Utils.mapPage(inner, inner1 -> new IncidentImpl(inner1, this.manager()));
@@ -71,15 +71,6 @@ public PagedIterable<Incident> list(
         return Utils.mapPage(inner, inner1 -> new IncidentImpl(inner1, this.manager()));
     }
 
-    public Incident get(String resourceGroupName, String workspaceName, String incidentId) {
-        IncidentInner inner = this.serviceClient().get(resourceGroupName, workspaceName, incidentId);
-        if (inner != null) {
-            return new IncidentImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<Incident> getWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, Context context) {
         Response<IncidentInner> inner =
@@ -95,8 +86,13 @@ public Response<Incident> getWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String incidentId) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, incidentId);
+    public Incident get(String resourceGroupName, String workspaceName, String incidentId) {
+        IncidentInner inner = this.serviceClient().get(resourceGroupName, workspaceName, incidentId);
+        if (inner != null) {
+            return new IncidentImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -104,15 +100,8 @@ public Response<Void> deleteWithResponse(
         return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, incidentId, context);
     }
 
-    public TeamInformation createTeam(
-        String resourceGroupName, String workspaceName, String incidentId, TeamProperties teamProperties) {
-        TeamInformationInner inner =
-            this.serviceClient().createTeam(resourceGroupName, workspaceName, incidentId, teamProperties);
-        if (inner != null) {
-            return new TeamInformationImpl(inner, this.manager());
-        } else {
-            return null;
-        }
+    public void delete(String resourceGroupName, String workspaceName, String incidentId) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, incidentId);
     }
 
     public Response<TeamInformation> createTeamWithResponse(
@@ -136,10 +125,12 @@ public Response<TeamInformation> createTeamWithResponse(
         }
     }
 
-    public IncidentAlertList listAlerts(String resourceGroupName, String workspaceName, String incidentId) {
-        IncidentAlertListInner inner = this.serviceClient().listAlerts(resourceGroupName, workspaceName, incidentId);
+    public TeamInformation createTeam(
+        String resourceGroupName, String workspaceName, String incidentId, TeamProperties teamProperties) {
+        TeamInformationInner inner =
+            this.serviceClient().createTeam(resourceGroupName, workspaceName, incidentId, teamProperties);
         if (inner != null) {
-            return new IncidentAlertListImpl(inner, this.manager());
+            return new TeamInformationImpl(inner, this.manager());
         } else {
             return null;
         }
@@ -160,11 +151,10 @@ public Response<IncidentAlertList> listAlertsWithResponse(
         }
     }
 
-    public IncidentBookmarkList listBookmarks(String resourceGroupName, String workspaceName, String incidentId) {
-        IncidentBookmarkListInner inner =
-            this.serviceClient().listBookmarks(resourceGroupName, workspaceName, incidentId);
+    public IncidentAlertList listAlerts(String resourceGroupName, String workspaceName, String incidentId) {
+        IncidentAlertListInner inner = this.serviceClient().listAlerts(resourceGroupName, workspaceName, incidentId);
         if (inner != null) {
-            return new IncidentBookmarkListImpl(inner, this.manager());
+            return new IncidentAlertListImpl(inner, this.manager());
         } else {
             return null;
         }
@@ -185,11 +175,11 @@ public Response<IncidentBookmarkList> listBookmarksWithResponse(
         }
     }
 
-    public IncidentEntitiesResponse listEntities(String resourceGroupName, String workspaceName, String incidentId) {
-        IncidentEntitiesResponseInner inner =
-            this.serviceClient().listEntities(resourceGroupName, workspaceName, incidentId);
+    public IncidentBookmarkList listBookmarks(String resourceGroupName, String workspaceName, String incidentId) {
+        IncidentBookmarkListInner inner =
+            this.serviceClient().listBookmarks(resourceGroupName, workspaceName, incidentId);
         if (inner != null) {
-            return new IncidentEntitiesResponseImpl(inner, this.manager());
+            return new IncidentBookmarkListImpl(inner, this.manager());
         } else {
             return null;
         }
@@ -210,6 +200,16 @@ public Response<IncidentEntitiesResponse> listEntitiesWithResponse(
         }
     }
 
+    public IncidentEntitiesResponse listEntities(String resourceGroupName, String workspaceName, String incidentId) {
+        IncidentEntitiesResponseInner inner =
+            this.serviceClient().listEntities(resourceGroupName, workspaceName, incidentId);
+        if (inner != null) {
+            return new IncidentEntitiesResponseImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     public Incident getById(String id) {
         String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
         if (resourceGroupName == null) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IpGeodatasClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IpGeodatasClientImpl.java
index cfcbc8e039f6..ffca4b6c37e5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IpGeodatasClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IpGeodatasClientImpl.java
@@ -180,14 +180,16 @@ private Mono<EnrichmentIpGeodataInner> getAsync(String resourceGroupName, String
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param ipAddress IP address (v4 or v6) to be enriched.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return geodata for a single IP address.
+     * @return geodata for a single IP address along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public EnrichmentIpGeodataInner get(String resourceGroupName, String ipAddress) {
-        return getAsync(resourceGroupName, ipAddress).block();
+    public Response<EnrichmentIpGeodataInner> getWithResponse(
+        String resourceGroupName, String ipAddress, Context context) {
+        return getWithResponseAsync(resourceGroupName, ipAddress, context).block();
     }
 
     /**
@@ -195,15 +197,13 @@ public EnrichmentIpGeodataInner get(String resourceGroupName, String ipAddress)
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param ipAddress IP address (v4 or v6) to be enriched.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return geodata for a single IP address along with {@link Response}.
+     * @return geodata for a single IP address.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<EnrichmentIpGeodataInner> getWithResponse(
-        String resourceGroupName, String ipAddress, Context context) {
-        return getWithResponseAsync(resourceGroupName, ipAddress, context).block();
+    public EnrichmentIpGeodataInner get(String resourceGroupName, String ipAddress) {
+        return getWithResponse(resourceGroupName, ipAddress, Context.NONE).getValue();
     }
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IpGeodatasImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IpGeodatasImpl.java
index 7afbd00545ef..0a8c91b33360 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IpGeodatasImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/IpGeodatasImpl.java
@@ -27,15 +27,6 @@ public IpGeodatasImpl(
         this.serviceManager = serviceManager;
     }
 
-    public EnrichmentIpGeodata get(String resourceGroupName, String ipAddress) {
-        EnrichmentIpGeodataInner inner = this.serviceClient().get(resourceGroupName, ipAddress);
-        if (inner != null) {
-            return new EnrichmentIpGeodataImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<EnrichmentIpGeodata> getWithResponse(String resourceGroupName, String ipAddress, Context context) {
         Response<EnrichmentIpGeodataInner> inner =
             this.serviceClient().getWithResponse(resourceGroupName, ipAddress, context);
@@ -50,6 +41,15 @@ public Response<EnrichmentIpGeodata> getWithResponse(String resourceGroupName, S
         }
     }
 
+    public EnrichmentIpGeodata get(String resourceGroupName, String ipAddress) {
+        EnrichmentIpGeodataInner inner = this.serviceClient().get(resourceGroupName, ipAddress);
+        if (inner != null) {
+            return new EnrichmentIpGeodataImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     private IpGeodatasClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/MetadatasClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/MetadatasClientImpl.java
index c99b2cc76eaf..bb796d5fd1c5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/MetadatasClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/MetadatasClientImpl.java
@@ -541,14 +541,16 @@ private Mono<MetadataModelInner> getAsync(String resourceGroupName, String works
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param metadataName The Metadata name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a Metadata.
+     * @return a Metadata along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public MetadataModelInner get(String resourceGroupName, String workspaceName, String metadataName) {
-        return getAsync(resourceGroupName, workspaceName, metadataName).block();
+    public Response<MetadataModelInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String metadataName, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, metadataName, context).block();
     }
 
     /**
@@ -557,16 +559,14 @@ public MetadataModelInner get(String resourceGroupName, String workspaceName, St
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param metadataName The Metadata name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a Metadata along with {@link Response}.
+     * @return a Metadata.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<MetadataModelInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String metadataName, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, metadataName, context).block();
+    public MetadataModelInner get(String resourceGroupName, String workspaceName, String metadataName) {
+        return getWithResponse(resourceGroupName, workspaceName, metadataName, Context.NONE).getValue();
     }
 
     /**
@@ -695,13 +695,16 @@ private Mono<Void> deleteAsync(String resourceGroupName, String workspaceName, S
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param metadataName The Metadata name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String metadataName) {
-        deleteAsync(resourceGroupName, workspaceName, metadataName).block();
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String metadataName, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, metadataName, context).block();
     }
 
     /**
@@ -710,16 +713,13 @@ public void delete(String resourceGroupName, String workspaceName, String metada
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param metadataName The Metadata name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String metadataName, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, metadataName, context).block();
+    public void delete(String resourceGroupName, String workspaceName, String metadataName) {
+        deleteWithResponse(resourceGroupName, workspaceName, metadataName, Context.NONE);
     }
 
     /**
@@ -870,15 +870,20 @@ private Mono<MetadataModelInner> createAsync(
      * @param workspaceName The name of the workspace.
      * @param metadataName The Metadata name.
      * @param metadata Metadata resource.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return metadata resource definition.
+     * @return metadata resource definition along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public MetadataModelInner create(
-        String resourceGroupName, String workspaceName, String metadataName, MetadataModelInner metadata) {
-        return createAsync(resourceGroupName, workspaceName, metadataName, metadata).block();
+    public Response<MetadataModelInner> createWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String metadataName,
+        MetadataModelInner metadata,
+        Context context) {
+        return createWithResponseAsync(resourceGroupName, workspaceName, metadataName, metadata, context).block();
     }
 
     /**
@@ -888,20 +893,15 @@ public MetadataModelInner create(
      * @param workspaceName The name of the workspace.
      * @param metadataName The Metadata name.
      * @param metadata Metadata resource.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return metadata resource definition along with {@link Response}.
+     * @return metadata resource definition.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<MetadataModelInner> createWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String metadataName,
-        MetadataModelInner metadata,
-        Context context) {
-        return createWithResponseAsync(resourceGroupName, workspaceName, metadataName, metadata, context).block();
+    public MetadataModelInner create(
+        String resourceGroupName, String workspaceName, String metadataName, MetadataModelInner metadata) {
+        return createWithResponse(resourceGroupName, workspaceName, metadataName, metadata, Context.NONE).getValue();
     }
 
     /**
@@ -1052,15 +1052,20 @@ private Mono<MetadataModelInner> updateAsync(
      * @param workspaceName The name of the workspace.
      * @param metadataName The Metadata name.
      * @param metadataPatch Partial metadata request.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return metadata resource definition.
+     * @return metadata resource definition along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public MetadataModelInner update(
-        String resourceGroupName, String workspaceName, String metadataName, MetadataPatch metadataPatch) {
-        return updateAsync(resourceGroupName, workspaceName, metadataName, metadataPatch).block();
+    public Response<MetadataModelInner> updateWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String metadataName,
+        MetadataPatch metadataPatch,
+        Context context) {
+        return updateWithResponseAsync(resourceGroupName, workspaceName, metadataName, metadataPatch, context).block();
     }
 
     /**
@@ -1070,20 +1075,16 @@ public MetadataModelInner update(
      * @param workspaceName The name of the workspace.
      * @param metadataName The Metadata name.
      * @param metadataPatch Partial metadata request.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return metadata resource definition along with {@link Response}.
+     * @return metadata resource definition.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<MetadataModelInner> updateWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String metadataName,
-        MetadataPatch metadataPatch,
-        Context context) {
-        return updateWithResponseAsync(resourceGroupName, workspaceName, metadataName, metadataPatch, context).block();
+    public MetadataModelInner update(
+        String resourceGroupName, String workspaceName, String metadataName, MetadataPatch metadataPatch) {
+        return updateWithResponse(resourceGroupName, workspaceName, metadataName, metadataPatch, Context.NONE)
+            .getValue();
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/MetadatasImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/MetadatasImpl.java
index fb795703dad2..3cc27196f79a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/MetadatasImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/MetadatasImpl.java
@@ -46,15 +46,6 @@ public PagedIterable<MetadataModel> list(
         return Utils.mapPage(inner, inner1 -> new MetadataModelImpl(inner1, this.manager()));
     }
 
-    public MetadataModel get(String resourceGroupName, String workspaceName, String metadataName) {
-        MetadataModelInner inner = this.serviceClient().get(resourceGroupName, workspaceName, metadataName);
-        if (inner != null) {
-            return new MetadataModelImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<MetadataModel> getWithResponse(
         String resourceGroupName, String workspaceName, String metadataName, Context context) {
         Response<MetadataModelInner> inner =
@@ -70,8 +61,13 @@ public Response<MetadataModel> getWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String metadataName) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, metadataName);
+    public MetadataModel get(String resourceGroupName, String workspaceName, String metadataName) {
+        MetadataModelInner inner = this.serviceClient().get(resourceGroupName, workspaceName, metadataName);
+        if (inner != null) {
+            return new MetadataModelImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -79,6 +75,10 @@ public Response<Void> deleteWithResponse(
         return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, metadataName, context);
     }
 
+    public void delete(String resourceGroupName, String workspaceName, String metadataName) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, metadataName);
+    }
+
     public MetadataModel getById(String id) {
         String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
         if (resourceGroupName == null) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/OfficeConsentsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/OfficeConsentsClientImpl.java
index fd9d8a21ca81..1d3da2441855 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/OfficeConsentsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/OfficeConsentsClientImpl.java
@@ -419,14 +419,16 @@ private Mono<OfficeConsentInner> getAsync(String resourceGroupName, String works
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param consentId consent ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an office365 consent.
+     * @return an office365 consent along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public OfficeConsentInner get(String resourceGroupName, String workspaceName, String consentId) {
-        return getAsync(resourceGroupName, workspaceName, consentId).block();
+    public Response<OfficeConsentInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String consentId, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, consentId, context).block();
     }
 
     /**
@@ -435,16 +437,14 @@ public OfficeConsentInner get(String resourceGroupName, String workspaceName, St
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param consentId consent ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an office365 consent along with {@link Response}.
+     * @return an office365 consent.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<OfficeConsentInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String consentId, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, consentId, context).block();
+    public OfficeConsentInner get(String resourceGroupName, String workspaceName, String consentId) {
+        return getWithResponse(resourceGroupName, workspaceName, consentId, Context.NONE).getValue();
     }
 
     /**
@@ -573,13 +573,16 @@ private Mono<Void> deleteAsync(String resourceGroupName, String workspaceName, S
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param consentId consent ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String consentId) {
-        deleteAsync(resourceGroupName, workspaceName, consentId).block();
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String consentId, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, consentId, context).block();
     }
 
     /**
@@ -588,16 +591,13 @@ public void delete(String resourceGroupName, String workspaceName, String consen
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param consentId consent ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String consentId, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, consentId, context).block();
+    public void delete(String resourceGroupName, String workspaceName, String consentId) {
+        deleteWithResponse(resourceGroupName, workspaceName, consentId, Context.NONE);
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/OfficeConsentsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/OfficeConsentsImpl.java
index 3f6213360a58..7bc64bd42e96 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/OfficeConsentsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/OfficeConsentsImpl.java
@@ -38,15 +38,6 @@ public PagedIterable<OfficeConsent> list(String resourceGroupName, String worksp
         return Utils.mapPage(inner, inner1 -> new OfficeConsentImpl(inner1, this.manager()));
     }
 
-    public OfficeConsent get(String resourceGroupName, String workspaceName, String consentId) {
-        OfficeConsentInner inner = this.serviceClient().get(resourceGroupName, workspaceName, consentId);
-        if (inner != null) {
-            return new OfficeConsentImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<OfficeConsent> getWithResponse(
         String resourceGroupName, String workspaceName, String consentId, Context context) {
         Response<OfficeConsentInner> inner =
@@ -62,8 +53,13 @@ public Response<OfficeConsent> getWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String consentId) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, consentId);
+    public OfficeConsent get(String resourceGroupName, String workspaceName, String consentId) {
+        OfficeConsentInner inner = this.serviceClient().get(resourceGroupName, workspaceName, consentId);
+        if (inner != null) {
+            return new OfficeConsentImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -71,6 +67,10 @@ public Response<Void> deleteWithResponse(
         return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, consentId, context);
     }
 
+    public void delete(String resourceGroupName, String workspaceName, String consentId) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, consentId);
+    }
+
     private OfficeConsentsClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ProductSettingsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ProductSettingsClientImpl.java
index 5a8f6c3d0f22..4a1414896c6e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ProductSettingsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ProductSettingsClientImpl.java
@@ -233,14 +233,16 @@ private Mono<SettingListInner> listAsync(String resourceGroupName, String worksp
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return list of all the settings.
+     * @return list of all the settings along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public SettingListInner list(String resourceGroupName, String workspaceName) {
-        return listAsync(resourceGroupName, workspaceName).block();
+    public Response<SettingListInner> listWithResponse(
+        String resourceGroupName, String workspaceName, Context context) {
+        return listWithResponseAsync(resourceGroupName, workspaceName, context).block();
     }
 
     /**
@@ -248,16 +250,14 @@ public SettingListInner list(String resourceGroupName, String workspaceName) {
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return list of all the settings along with {@link Response}.
+     * @return list of all the settings.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<SettingListInner> listWithResponse(
-        String resourceGroupName, String workspaceName, Context context) {
-        return listWithResponseAsync(resourceGroupName, workspaceName, context).block();
+    public SettingListInner list(String resourceGroupName, String workspaceName) {
+        return listWithResponse(resourceGroupName, workspaceName, Context.NONE).getValue();
     }
 
     /**
@@ -387,14 +387,16 @@ private Mono<SettingsInner> getAsync(String resourceGroupName, String workspaceN
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsName The setting name. Supports - Anomalies, EyesOn, EntityAnalytics, Ueba.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a setting.
+     * @return a setting along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public SettingsInner get(String resourceGroupName, String workspaceName, String settingsName) {
-        return getAsync(resourceGroupName, workspaceName, settingsName).block();
+    public Response<SettingsInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String settingsName, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, settingsName, context).block();
     }
 
     /**
@@ -403,16 +405,14 @@ public SettingsInner get(String resourceGroupName, String workspaceName, String
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsName The setting name. Supports - Anomalies, EyesOn, EntityAnalytics, Ueba.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a setting along with {@link Response}.
+     * @return a setting.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<SettingsInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String settingsName, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, settingsName, context).block();
+    public SettingsInner get(String resourceGroupName, String workspaceName, String settingsName) {
+        return getWithResponse(resourceGroupName, workspaceName, settingsName, Context.NONE).getValue();
     }
 
     /**
@@ -541,13 +541,16 @@ private Mono<Void> deleteAsync(String resourceGroupName, String workspaceName, S
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsName The setting name. Supports - Anomalies, EyesOn, EntityAnalytics, Ueba.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String settingsName) {
-        deleteAsync(resourceGroupName, workspaceName, settingsName).block();
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String settingsName, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, settingsName, context).block();
     }
 
     /**
@@ -556,16 +559,13 @@ public void delete(String resourceGroupName, String workspaceName, String settin
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsName The setting name. Supports - Anomalies, EyesOn, EntityAnalytics, Ueba.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String settingsName, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, settingsName, context).block();
+    public void delete(String resourceGroupName, String workspaceName, String settingsName) {
+        deleteWithResponse(resourceGroupName, workspaceName, settingsName, Context.NONE);
     }
 
     /**
@@ -712,15 +712,16 @@ private Mono<SettingsInner> updateAsync(
      * @param workspaceName The name of the workspace.
      * @param settingsName The setting name. Supports - Anomalies, EyesOn, EntityAnalytics, Ueba.
      * @param settings The setting.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Setting.
+     * @return the Setting along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public SettingsInner update(
-        String resourceGroupName, String workspaceName, String settingsName, SettingsInner settings) {
-        return updateAsync(resourceGroupName, workspaceName, settingsName, settings).block();
+    public Response<SettingsInner> updateWithResponse(
+        String resourceGroupName, String workspaceName, String settingsName, SettingsInner settings, Context context) {
+        return updateWithResponseAsync(resourceGroupName, workspaceName, settingsName, settings, context).block();
     }
 
     /**
@@ -730,15 +731,14 @@ public SettingsInner update(
      * @param workspaceName The name of the workspace.
      * @param settingsName The setting name. Supports - Anomalies, EyesOn, EntityAnalytics, Ueba.
      * @param settings The setting.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Setting along with {@link Response}.
+     * @return the Setting.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<SettingsInner> updateWithResponse(
-        String resourceGroupName, String workspaceName, String settingsName, SettingsInner settings, Context context) {
-        return updateWithResponseAsync(resourceGroupName, workspaceName, settingsName, settings, context).block();
+    public SettingsInner update(
+        String resourceGroupName, String workspaceName, String settingsName, SettingsInner settings) {
+        return updateWithResponse(resourceGroupName, workspaceName, settingsName, settings, Context.NONE).getValue();
     }
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ProductSettingsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ProductSettingsImpl.java
index 5596bd0f4aa9..7f8993cab138 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ProductSettingsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ProductSettingsImpl.java
@@ -29,15 +29,6 @@ public ProductSettingsImpl(
         this.serviceManager = serviceManager;
     }
 
-    public SettingList list(String resourceGroupName, String workspaceName) {
-        SettingListInner inner = this.serviceClient().list(resourceGroupName, workspaceName);
-        if (inner != null) {
-            return new SettingListImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<SettingList> listWithResponse(String resourceGroupName, String workspaceName, Context context) {
         Response<SettingListInner> inner =
             this.serviceClient().listWithResponse(resourceGroupName, workspaceName, context);
@@ -52,10 +43,10 @@ public Response<SettingList> listWithResponse(String resourceGroupName, String w
         }
     }
 
-    public Settings get(String resourceGroupName, String workspaceName, String settingsName) {
-        SettingsInner inner = this.serviceClient().get(resourceGroupName, workspaceName, settingsName);
+    public SettingList list(String resourceGroupName, String workspaceName) {
+        SettingListInner inner = this.serviceClient().list(resourceGroupName, workspaceName);
         if (inner != null) {
-            return new SettingsImpl(inner, this.manager());
+            return new SettingListImpl(inner, this.manager());
         } else {
             return null;
         }
@@ -76,8 +67,13 @@ public Response<Settings> getWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String settingsName) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, settingsName);
+    public Settings get(String resourceGroupName, String workspaceName, String settingsName) {
+        SettingsInner inner = this.serviceClient().get(resourceGroupName, workspaceName, settingsName);
+        if (inner != null) {
+            return new SettingsImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -85,14 +81,8 @@ public Response<Void> deleteWithResponse(
         return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, settingsName, context);
     }
 
-    public Settings update(
-        String resourceGroupName, String workspaceName, String settingsName, SettingsInner settings) {
-        SettingsInner inner = this.serviceClient().update(resourceGroupName, workspaceName, settingsName, settings);
-        if (inner != null) {
-            return new SettingsImpl(inner, this.manager());
-        } else {
-            return null;
-        }
+    public void delete(String resourceGroupName, String workspaceName, String settingsName) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, settingsName);
     }
 
     public Response<Settings> updateWithResponse(
@@ -110,6 +100,16 @@ public Response<Settings> updateWithResponse(
         }
     }
 
+    public Settings update(
+        String resourceGroupName, String workspaceName, String settingsName, SettingsInner settings) {
+        SettingsInner inner = this.serviceClient().update(resourceGroupName, workspaceName, settingsName, settings);
+        if (inner != null) {
+            return new SettingsImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     private ProductSettingsClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SecurityInsightsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SecurityInsightsImpl.java
index 86963e3bc62a..da79633ab3e6 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SecurityInsightsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SecurityInsightsImpl.java
@@ -57,6 +57,7 @@
 import com.azure.resourcemanager.securityinsights.fluent.ThreatIntelligenceIndicatorsOperationsClient;
 import com.azure.resourcemanager.securityinsights.fluent.WatchlistItemsClient;
 import com.azure.resourcemanager.securityinsights.fluent.WatchlistsClient;
+import com.azure.resourcemanager.securityinsights.fluent.WorkspaceManagerConfigurationsClient;
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.nio.ByteBuffer;
@@ -513,6 +514,18 @@ public WatchlistItemsClient getWatchlistItems() {
         return this.watchlistItems;
     }
 
+    /** The WorkspaceManagerConfigurationsClient object to access its operations. */
+    private final WorkspaceManagerConfigurationsClient workspaceManagerConfigurations;
+
+    /**
+     * Gets the WorkspaceManagerConfigurationsClient object to access its operations.
+     *
+     * @return the WorkspaceManagerConfigurationsClient object.
+     */
+    public WorkspaceManagerConfigurationsClient getWorkspaceManagerConfigurations() {
+        return this.workspaceManagerConfigurations;
+    }
+
     /** The DataConnectorsClient object to access its operations. */
     private final DataConnectorsClient dataConnectors;
 
@@ -571,7 +584,7 @@ public OperationsClient getOperations() {
         this.defaultPollInterval = defaultPollInterval;
         this.subscriptionId = subscriptionId;
         this.endpoint = endpoint;
-        this.apiVersion = "2022-09-01-preview";
+        this.apiVersion = "2023-03-01-preview";
         this.alertRules = new AlertRulesClientImpl(this);
         this.actions = new ActionsClientImpl(this);
         this.alertRuleTemplates = new AlertRuleTemplatesClientImpl(this);
@@ -603,6 +616,7 @@ public OperationsClient getOperations() {
         this.threatIntelligenceIndicatorMetrics = new ThreatIntelligenceIndicatorMetricsClientImpl(this);
         this.watchlists = new WatchlistsClientImpl(this);
         this.watchlistItems = new WatchlistItemsClientImpl(this);
+        this.workspaceManagerConfigurations = new WorkspaceManagerConfigurationsClientImpl(this);
         this.dataConnectors = new DataConnectorsClientImpl(this);
         this.dataConnectorsCheckRequirementsOperations = new DataConnectorsCheckRequirementsOperationsClientImpl(this);
         this.operations = new OperationsClientImpl(this);
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SecurityMLAnalyticsSettingsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SecurityMLAnalyticsSettingsClientImpl.java
index 2cd597054440..6f0ca70d610d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SecurityMLAnalyticsSettingsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SecurityMLAnalyticsSettingsClientImpl.java
@@ -450,15 +450,16 @@ private Mono<SecurityMLAnalyticsSettingInner> getAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Security ML Analytics Settings.
+     * @return the Security ML Analytics Settings along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public SecurityMLAnalyticsSettingInner get(
-        String resourceGroupName, String workspaceName, String settingsResourceName) {
-        return getAsync(resourceGroupName, workspaceName, settingsResourceName).block();
+    public Response<SecurityMLAnalyticsSettingInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String settingsResourceName, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, settingsResourceName, context).block();
     }
 
     /**
@@ -467,16 +468,15 @@ public SecurityMLAnalyticsSettingInner get(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Security ML Analytics Settings along with {@link Response}.
+     * @return the Security ML Analytics Settings.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<SecurityMLAnalyticsSettingInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String settingsResourceName, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, settingsResourceName, context).block();
+    public SecurityMLAnalyticsSettingInner get(
+        String resourceGroupName, String workspaceName, String settingsResourceName) {
+        return getWithResponse(resourceGroupName, workspaceName, settingsResourceName, Context.NONE).getValue();
     }
 
     /**
@@ -642,18 +642,21 @@ private Mono<SecurityMLAnalyticsSettingInner> createOrUpdateAsync(
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
      * @param securityMLAnalyticsSetting The security ML Analytics setting.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return security ML Analytics Setting.
+     * @return security ML Analytics Setting along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public SecurityMLAnalyticsSettingInner createOrUpdate(
+    public Response<SecurityMLAnalyticsSettingInner> createOrUpdateWithResponse(
         String resourceGroupName,
         String workspaceName,
         String settingsResourceName,
-        SecurityMLAnalyticsSettingInner securityMLAnalyticsSetting) {
-        return createOrUpdateAsync(resourceGroupName, workspaceName, settingsResourceName, securityMLAnalyticsSetting)
+        SecurityMLAnalyticsSettingInner securityMLAnalyticsSetting,
+        Context context) {
+        return createOrUpdateWithResponseAsync(
+                resourceGroupName, workspaceName, settingsResourceName, securityMLAnalyticsSetting, context)
             .block();
     }
 
@@ -664,22 +667,20 @@ public SecurityMLAnalyticsSettingInner createOrUpdate(
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
      * @param securityMLAnalyticsSetting The security ML Analytics setting.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return security ML Analytics Setting along with {@link Response}.
+     * @return security ML Analytics Setting.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<SecurityMLAnalyticsSettingInner> createOrUpdateWithResponse(
+    public SecurityMLAnalyticsSettingInner createOrUpdate(
         String resourceGroupName,
         String workspaceName,
         String settingsResourceName,
-        SecurityMLAnalyticsSettingInner securityMLAnalyticsSetting,
-        Context context) {
-        return createOrUpdateWithResponseAsync(
-                resourceGroupName, workspaceName, settingsResourceName, securityMLAnalyticsSetting, context)
-            .block();
+        SecurityMLAnalyticsSettingInner securityMLAnalyticsSetting) {
+        return createOrUpdateWithResponse(
+                resourceGroupName, workspaceName, settingsResourceName, securityMLAnalyticsSetting, Context.NONE)
+            .getValue();
     }
 
     /**
@@ -811,13 +812,16 @@ private Mono<Void> deleteAsync(String resourceGroupName, String workspaceName, S
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String settingsResourceName) {
-        deleteAsync(resourceGroupName, workspaceName, settingsResourceName).block();
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String settingsResourceName, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, settingsResourceName, context).block();
     }
 
     /**
@@ -826,16 +830,13 @@ public void delete(String resourceGroupName, String workspaceName, String settin
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String settingsResourceName, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, settingsResourceName, context).block();
+    public void delete(String resourceGroupName, String workspaceName, String settingsResourceName) {
+        deleteWithResponse(resourceGroupName, workspaceName, settingsResourceName, Context.NONE);
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SecurityMLAnalyticsSettingsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SecurityMLAnalyticsSettingsImpl.java
index f0d4218f31a3..3404cd1a75eb 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SecurityMLAnalyticsSettingsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SecurityMLAnalyticsSettingsImpl.java
@@ -41,16 +41,6 @@ public PagedIterable<SecurityMLAnalyticsSetting> list(
         return Utils.mapPage(inner, inner1 -> new SecurityMLAnalyticsSettingImpl(inner1, this.manager()));
     }
 
-    public SecurityMLAnalyticsSetting get(String resourceGroupName, String workspaceName, String settingsResourceName) {
-        SecurityMLAnalyticsSettingInner inner =
-            this.serviceClient().get(resourceGroupName, workspaceName, settingsResourceName);
-        if (inner != null) {
-            return new SecurityMLAnalyticsSettingImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<SecurityMLAnalyticsSetting> getWithResponse(
         String resourceGroupName, String workspaceName, String settingsResourceName, Context context) {
         Response<SecurityMLAnalyticsSettingInner> inner =
@@ -66,15 +56,9 @@ public Response<SecurityMLAnalyticsSetting> getWithResponse(
         }
     }
 
-    public SecurityMLAnalyticsSetting createOrUpdate(
-        String resourceGroupName,
-        String workspaceName,
-        String settingsResourceName,
-        SecurityMLAnalyticsSettingInner securityMLAnalyticsSetting) {
+    public SecurityMLAnalyticsSetting get(String resourceGroupName, String workspaceName, String settingsResourceName) {
         SecurityMLAnalyticsSettingInner inner =
-            this
-                .serviceClient()
-                .createOrUpdate(resourceGroupName, workspaceName, settingsResourceName, securityMLAnalyticsSetting);
+            this.serviceClient().get(resourceGroupName, workspaceName, settingsResourceName);
         if (inner != null) {
             return new SecurityMLAnalyticsSettingImpl(inner, this.manager());
         } else {
@@ -104,8 +88,20 @@ public Response<SecurityMLAnalyticsSetting> createOrUpdateWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String settingsResourceName) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, settingsResourceName);
+    public SecurityMLAnalyticsSetting createOrUpdate(
+        String resourceGroupName,
+        String workspaceName,
+        String settingsResourceName,
+        SecurityMLAnalyticsSettingInner securityMLAnalyticsSetting) {
+        SecurityMLAnalyticsSettingInner inner =
+            this
+                .serviceClient()
+                .createOrUpdate(resourceGroupName, workspaceName, settingsResourceName, securityMLAnalyticsSetting);
+        if (inner != null) {
+            return new SecurityMLAnalyticsSettingImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -113,6 +109,10 @@ public Response<Void> deleteWithResponse(
         return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, settingsResourceName, context);
     }
 
+    public void delete(String resourceGroupName, String workspaceName, String settingsResourceName) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, settingsResourceName);
+    }
+
     private SecurityMLAnalyticsSettingsClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SentinelOnboardingStatesClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SentinelOnboardingStatesClientImpl.java
index 9035d0d85eef..63d68d7dc677 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SentinelOnboardingStatesClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SentinelOnboardingStatesClientImpl.java
@@ -258,15 +258,16 @@ private Mono<SentinelOnboardingStateInner> getAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sentinelOnboardingStateName The Sentinel onboarding state name. Supports - default.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return sentinel onboarding state.
+     * @return sentinel onboarding state along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public SentinelOnboardingStateInner get(
-        String resourceGroupName, String workspaceName, String sentinelOnboardingStateName) {
-        return getAsync(resourceGroupName, workspaceName, sentinelOnboardingStateName).block();
+    public Response<SentinelOnboardingStateInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String sentinelOnboardingStateName, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, sentinelOnboardingStateName, context).block();
     }
 
     /**
@@ -275,16 +276,15 @@ public SentinelOnboardingStateInner get(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sentinelOnboardingStateName The Sentinel onboarding state name. Supports - default.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return sentinel onboarding state along with {@link Response}.
+     * @return sentinel onboarding state.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<SentinelOnboardingStateInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String sentinelOnboardingStateName, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, sentinelOnboardingStateName, context).block();
+    public SentinelOnboardingStateInner get(
+        String resourceGroupName, String workspaceName, String sentinelOnboardingStateName) {
+        return getWithResponse(resourceGroupName, workspaceName, sentinelOnboardingStateName, Context.NONE).getValue();
     }
 
     /**
@@ -420,7 +420,6 @@ private Mono<Response<SentinelOnboardingStateInner>> createWithResponseAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sentinelOnboardingStateName The Sentinel onboarding state name. Supports - default.
-     * @param sentinelOnboardingStateParameter The Sentinel onboarding state parameter.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -428,10 +427,8 @@ private Mono<Response<SentinelOnboardingStateInner>> createWithResponseAsync(
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<SentinelOnboardingStateInner> createAsync(
-        String resourceGroupName,
-        String workspaceName,
-        String sentinelOnboardingStateName,
-        SentinelOnboardingStateInner sentinelOnboardingStateParameter) {
+        String resourceGroupName, String workspaceName, String sentinelOnboardingStateName) {
+        final SentinelOnboardingStateInner sentinelOnboardingStateParameter = null;
         return createWithResponseAsync(
                 resourceGroupName, workspaceName, sentinelOnboardingStateName, sentinelOnboardingStateParameter)
             .flatMap(res -> Mono.justOrEmpty(res.getValue()));
@@ -443,18 +440,27 @@ private Mono<SentinelOnboardingStateInner> createAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sentinelOnboardingStateName The Sentinel onboarding state name. Supports - default.
+     * @param sentinelOnboardingStateParameter The Sentinel onboarding state parameter.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return sentinel onboarding state on successful completion of {@link Mono}.
+     * @return sentinel onboarding state along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<SentinelOnboardingStateInner> createAsync(
-        String resourceGroupName, String workspaceName, String sentinelOnboardingStateName) {
-        final SentinelOnboardingStateInner sentinelOnboardingStateParameter = null;
+    public Response<SentinelOnboardingStateInner> createWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String sentinelOnboardingStateName,
+        SentinelOnboardingStateInner sentinelOnboardingStateParameter,
+        Context context) {
         return createWithResponseAsync(
-                resourceGroupName, workspaceName, sentinelOnboardingStateName, sentinelOnboardingStateParameter)
-            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+                resourceGroupName,
+                workspaceName,
+                sentinelOnboardingStateName,
+                sentinelOnboardingStateParameter,
+                context)
+            .block();
     }
 
     /**
@@ -472,38 +478,13 @@ private Mono<SentinelOnboardingStateInner> createAsync(
     public SentinelOnboardingStateInner create(
         String resourceGroupName, String workspaceName, String sentinelOnboardingStateName) {
         final SentinelOnboardingStateInner sentinelOnboardingStateParameter = null;
-        return createAsync(
-                resourceGroupName, workspaceName, sentinelOnboardingStateName, sentinelOnboardingStateParameter)
-            .block();
-    }
-
-    /**
-     * Create Sentinel onboarding state.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param sentinelOnboardingStateName The Sentinel onboarding state name. Supports - default.
-     * @param sentinelOnboardingStateParameter The Sentinel onboarding state parameter.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return sentinel onboarding state along with {@link Response}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<SentinelOnboardingStateInner> createWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String sentinelOnboardingStateName,
-        SentinelOnboardingStateInner sentinelOnboardingStateParameter,
-        Context context) {
-        return createWithResponseAsync(
+        return createWithResponse(
                 resourceGroupName,
                 workspaceName,
                 sentinelOnboardingStateName,
                 sentinelOnboardingStateParameter,
-                context)
-            .block();
+                Context.NONE)
+            .getValue();
     }
 
     /**
@@ -639,13 +620,16 @@ private Mono<Void> deleteAsync(String resourceGroupName, String workspaceName, S
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sentinelOnboardingStateName The Sentinel onboarding state name. Supports - default.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String sentinelOnboardingStateName) {
-        deleteAsync(resourceGroupName, workspaceName, sentinelOnboardingStateName).block();
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String sentinelOnboardingStateName, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, sentinelOnboardingStateName, context).block();
     }
 
     /**
@@ -654,16 +638,13 @@ public void delete(String resourceGroupName, String workspaceName, String sentin
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sentinelOnboardingStateName The Sentinel onboarding state name. Supports - default.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String sentinelOnboardingStateName, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, sentinelOnboardingStateName, context).block();
+    public void delete(String resourceGroupName, String workspaceName, String sentinelOnboardingStateName) {
+        deleteWithResponse(resourceGroupName, workspaceName, sentinelOnboardingStateName, Context.NONE);
     }
 
     /**
@@ -780,14 +761,16 @@ private Mono<SentinelOnboardingStatesListInner> listAsync(String resourceGroupNa
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all Sentinel onboarding states.
+     * @return all Sentinel onboarding states along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public SentinelOnboardingStatesListInner list(String resourceGroupName, String workspaceName) {
-        return listAsync(resourceGroupName, workspaceName).block();
+    public Response<SentinelOnboardingStatesListInner> listWithResponse(
+        String resourceGroupName, String workspaceName, Context context) {
+        return listWithResponseAsync(resourceGroupName, workspaceName, context).block();
     }
 
     /**
@@ -795,15 +778,13 @@ public SentinelOnboardingStatesListInner list(String resourceGroupName, String w
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all Sentinel onboarding states along with {@link Response}.
+     * @return all Sentinel onboarding states.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<SentinelOnboardingStatesListInner> listWithResponse(
-        String resourceGroupName, String workspaceName, Context context) {
-        return listWithResponseAsync(resourceGroupName, workspaceName, context).block();
+    public SentinelOnboardingStatesListInner list(String resourceGroupName, String workspaceName) {
+        return listWithResponse(resourceGroupName, workspaceName, Context.NONE).getValue();
     }
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SentinelOnboardingStatesImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SentinelOnboardingStatesImpl.java
index 805ce3714bf1..807a52a88f80 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SentinelOnboardingStatesImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SentinelOnboardingStatesImpl.java
@@ -29,17 +29,6 @@ public SentinelOnboardingStatesImpl(
         this.serviceManager = serviceManager;
     }
 
-    public SentinelOnboardingState get(
-        String resourceGroupName, String workspaceName, String sentinelOnboardingStateName) {
-        SentinelOnboardingStateInner inner =
-            this.serviceClient().get(resourceGroupName, workspaceName, sentinelOnboardingStateName);
-        if (inner != null) {
-            return new SentinelOnboardingStateImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<SentinelOnboardingState> getWithResponse(
         String resourceGroupName, String workspaceName, String sentinelOnboardingStateName, Context context) {
         Response<SentinelOnboardingStateInner> inner =
@@ -57,8 +46,15 @@ public Response<SentinelOnboardingState> getWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String sentinelOnboardingStateName) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, sentinelOnboardingStateName);
+    public SentinelOnboardingState get(
+        String resourceGroupName, String workspaceName, String sentinelOnboardingStateName) {
+        SentinelOnboardingStateInner inner =
+            this.serviceClient().get(resourceGroupName, workspaceName, sentinelOnboardingStateName);
+        if (inner != null) {
+            return new SentinelOnboardingStateImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -68,13 +64,8 @@ public Response<Void> deleteWithResponse(
             .deleteWithResponse(resourceGroupName, workspaceName, sentinelOnboardingStateName, context);
     }
 
-    public SentinelOnboardingStatesList list(String resourceGroupName, String workspaceName) {
-        SentinelOnboardingStatesListInner inner = this.serviceClient().list(resourceGroupName, workspaceName);
-        if (inner != null) {
-            return new SentinelOnboardingStatesListImpl(inner, this.manager());
-        } else {
-            return null;
-        }
+    public void delete(String resourceGroupName, String workspaceName, String sentinelOnboardingStateName) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, sentinelOnboardingStateName);
     }
 
     public Response<SentinelOnboardingStatesList> listWithResponse(
@@ -92,6 +83,15 @@ public Response<SentinelOnboardingStatesList> listWithResponse(
         }
     }
 
+    public SentinelOnboardingStatesList list(String resourceGroupName, String workspaceName) {
+        SentinelOnboardingStatesListInner inner = this.serviceClient().list(resourceGroupName, workspaceName);
+        if (inner != null) {
+            return new SentinelOnboardingStatesListImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     public SentinelOnboardingState getById(String id) {
         String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
         if (resourceGroupName == null) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SourceControlsOperationsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SourceControlsOperationsClientImpl.java
index 154c48e0138a..cfc4077a7494 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SourceControlsOperationsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SourceControlsOperationsClientImpl.java
@@ -443,14 +443,16 @@ private Mono<SourceControlInner> getAsync(String resourceGroupName, String works
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sourceControlId Source control Id.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a source control byt its identifier.
+     * @return a source control byt its identifier along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public SourceControlInner get(String resourceGroupName, String workspaceName, String sourceControlId) {
-        return getAsync(resourceGroupName, workspaceName, sourceControlId).block();
+    public Response<SourceControlInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String sourceControlId, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, sourceControlId, context).block();
     }
 
     /**
@@ -459,16 +461,14 @@ public SourceControlInner get(String resourceGroupName, String workspaceName, St
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sourceControlId Source control Id.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a source control byt its identifier along with {@link Response}.
+     * @return a source control byt its identifier.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<SourceControlInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String sourceControlId, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, sourceControlId, context).block();
+    public SourceControlInner get(String resourceGroupName, String workspaceName, String sourceControlId) {
+        return getWithResponse(resourceGroupName, workspaceName, sourceControlId, Context.NONE).getValue();
     }
 
     /**
@@ -600,13 +600,16 @@ private Mono<Void> deleteAsync(String resourceGroupName, String workspaceName, S
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sourceControlId Source control Id.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String sourceControlId) {
-        deleteAsync(resourceGroupName, workspaceName, sourceControlId).block();
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String sourceControlId, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, sourceControlId, context).block();
     }
 
     /**
@@ -615,16 +618,13 @@ public void delete(String resourceGroupName, String workspaceName, String source
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sourceControlId Source control Id.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String sourceControlId, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, sourceControlId, context).block();
+    public void delete(String resourceGroupName, String workspaceName, String sourceControlId) {
+        deleteWithResponse(resourceGroupName, workspaceName, sourceControlId, Context.NONE);
     }
 
     /**
@@ -779,15 +779,21 @@ private Mono<SourceControlInner> createAsync(
      * @param workspaceName The name of the workspace.
      * @param sourceControlId Source control Id.
      * @param sourceControl The SourceControl.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a SourceControl in Azure Security Insights.
+     * @return represents a SourceControl in Azure Security Insights along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public SourceControlInner create(
-        String resourceGroupName, String workspaceName, String sourceControlId, SourceControlInner sourceControl) {
-        return createAsync(resourceGroupName, workspaceName, sourceControlId, sourceControl).block();
+    public Response<SourceControlInner> createWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String sourceControlId,
+        SourceControlInner sourceControl,
+        Context context) {
+        return createWithResponseAsync(resourceGroupName, workspaceName, sourceControlId, sourceControl, context)
+            .block();
     }
 
     /**
@@ -797,21 +803,16 @@ public SourceControlInner create(
      * @param workspaceName The name of the workspace.
      * @param sourceControlId Source control Id.
      * @param sourceControl The SourceControl.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a SourceControl in Azure Security Insights along with {@link Response}.
+     * @return represents a SourceControl in Azure Security Insights.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<SourceControlInner> createWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String sourceControlId,
-        SourceControlInner sourceControl,
-        Context context) {
-        return createWithResponseAsync(resourceGroupName, workspaceName, sourceControlId, sourceControl, context)
-            .block();
+    public SourceControlInner create(
+        String resourceGroupName, String workspaceName, String sourceControlId, SourceControlInner sourceControl) {
+        return createWithResponse(resourceGroupName, workspaceName, sourceControlId, sourceControl, Context.NONE)
+            .getValue();
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SourceControlsOperationsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SourceControlsOperationsImpl.java
index 467e637cf289..0e8b7d4b94c9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SourceControlsOperationsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/SourceControlsOperationsImpl.java
@@ -38,15 +38,6 @@ public PagedIterable<SourceControl> list(String resourceGroupName, String worksp
         return Utils.mapPage(inner, inner1 -> new SourceControlImpl(inner1, this.manager()));
     }
 
-    public SourceControl get(String resourceGroupName, String workspaceName, String sourceControlId) {
-        SourceControlInner inner = this.serviceClient().get(resourceGroupName, workspaceName, sourceControlId);
-        if (inner != null) {
-            return new SourceControlImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<SourceControl> getWithResponse(
         String resourceGroupName, String workspaceName, String sourceControlId, Context context) {
         Response<SourceControlInner> inner =
@@ -62,8 +53,13 @@ public Response<SourceControl> getWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String sourceControlId) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, sourceControlId);
+    public SourceControl get(String resourceGroupName, String workspaceName, String sourceControlId) {
+        SourceControlInner inner = this.serviceClient().get(resourceGroupName, workspaceName, sourceControlId);
+        if (inner != null) {
+            return new SourceControlImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -71,6 +67,10 @@ public Response<Void> deleteWithResponse(
         return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, sourceControlId, context);
     }
 
+    public void delete(String resourceGroupName, String workspaceName, String sourceControlId) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, sourceControlId);
+    }
+
     public SourceControl getById(String id) {
         String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
         if (resourceGroupName == null) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ThreatIntelligenceIndicatorMetricsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ThreatIntelligenceIndicatorMetricsClientImpl.java
index 246f25d1030c..cd51f6e57346 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ThreatIntelligenceIndicatorMetricsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ThreatIntelligenceIndicatorMetricsClientImpl.java
@@ -190,14 +190,17 @@ private Mono<ThreatIntelligenceMetricsListInner> listAsync(String resourceGroupN
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence indicators metrics (Indicators counts by Type, Threat Type, Source).
+     * @return threat intelligence indicators metrics (Indicators counts by Type, Threat Type, Source) along with {@link
+     *     Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public ThreatIntelligenceMetricsListInner list(String resourceGroupName, String workspaceName) {
-        return listAsync(resourceGroupName, workspaceName).block();
+    public Response<ThreatIntelligenceMetricsListInner> listWithResponse(
+        String resourceGroupName, String workspaceName, Context context) {
+        return listWithResponseAsync(resourceGroupName, workspaceName, context).block();
     }
 
     /**
@@ -205,16 +208,13 @@ public ThreatIntelligenceMetricsListInner list(String resourceGroupName, String
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence indicators metrics (Indicators counts by Type, Threat Type, Source) along with {@link
-     *     Response}.
+     * @return threat intelligence indicators metrics (Indicators counts by Type, Threat Type, Source).
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<ThreatIntelligenceMetricsListInner> listWithResponse(
-        String resourceGroupName, String workspaceName, Context context) {
-        return listWithResponseAsync(resourceGroupName, workspaceName, context).block();
+    public ThreatIntelligenceMetricsListInner list(String resourceGroupName, String workspaceName) {
+        return listWithResponse(resourceGroupName, workspaceName, Context.NONE).getValue();
     }
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ThreatIntelligenceIndicatorMetricsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ThreatIntelligenceIndicatorMetricsImpl.java
index a89b3041bc58..b47abd6de5d0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ThreatIntelligenceIndicatorMetricsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ThreatIntelligenceIndicatorMetricsImpl.java
@@ -27,15 +27,6 @@ public ThreatIntelligenceIndicatorMetricsImpl(
         this.serviceManager = serviceManager;
     }
 
-    public ThreatIntelligenceMetricsList list(String resourceGroupName, String workspaceName) {
-        ThreatIntelligenceMetricsListInner inner = this.serviceClient().list(resourceGroupName, workspaceName);
-        if (inner != null) {
-            return new ThreatIntelligenceMetricsListImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<ThreatIntelligenceMetricsList> listWithResponse(
         String resourceGroupName, String workspaceName, Context context) {
         Response<ThreatIntelligenceMetricsListInner> inner =
@@ -51,6 +42,15 @@ public Response<ThreatIntelligenceMetricsList> listWithResponse(
         }
     }
 
+    public ThreatIntelligenceMetricsList list(String resourceGroupName, String workspaceName) {
+        ThreatIntelligenceMetricsListInner inner = this.serviceClient().list(resourceGroupName, workspaceName);
+        if (inner != null) {
+            return new ThreatIntelligenceMetricsListImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     private ThreatIntelligenceIndicatorMetricsClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ThreatIntelligenceIndicatorsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ThreatIntelligenceIndicatorsClientImpl.java
index c25005bfa019..bbc1c14ec1ac 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ThreatIntelligenceIndicatorsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ThreatIntelligenceIndicatorsClientImpl.java
@@ -341,15 +341,20 @@ private Mono<ThreatIntelligenceInformationInner> createIndicatorAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param threatIntelligenceProperties Properties of threat intelligence indicators to create and update.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence information object.
+     * @return threat intelligence information object along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public ThreatIntelligenceInformationInner createIndicator(
-        String resourceGroupName, String workspaceName, ThreatIntelligenceIndicatorModel threatIntelligenceProperties) {
-        return createIndicatorAsync(resourceGroupName, workspaceName, threatIntelligenceProperties).block();
+    public Response<ThreatIntelligenceInformationInner> createIndicatorWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        ThreatIntelligenceIndicatorModel threatIntelligenceProperties,
+        Context context) {
+        return createIndicatorWithResponseAsync(resourceGroupName, workspaceName, threatIntelligenceProperties, context)
+            .block();
     }
 
     /**
@@ -358,20 +363,16 @@ public ThreatIntelligenceInformationInner createIndicator(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param threatIntelligenceProperties Properties of threat intelligence indicators to create and update.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence information object along with {@link Response}.
+     * @return threat intelligence information object.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<ThreatIntelligenceInformationInner> createIndicatorWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        ThreatIntelligenceIndicatorModel threatIntelligenceProperties,
-        Context context) {
-        return createIndicatorWithResponseAsync(resourceGroupName, workspaceName, threatIntelligenceProperties, context)
-            .block();
+    public ThreatIntelligenceInformationInner createIndicator(
+        String resourceGroupName, String workspaceName, ThreatIntelligenceIndicatorModel threatIntelligenceProperties) {
+        return createIndicatorWithResponse(resourceGroupName, workspaceName, threatIntelligenceProperties, Context.NONE)
+            .getValue();
     }
 
     /**
@@ -504,14 +505,16 @@ private Mono<ThreatIntelligenceInformationInner> getAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence information object.
+     * @return threat intelligence information object along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public ThreatIntelligenceInformationInner get(String resourceGroupName, String workspaceName, String name) {
-        return getAsync(resourceGroupName, workspaceName, name).block();
+    public Response<ThreatIntelligenceInformationInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String name, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, name, context).block();
     }
 
     /**
@@ -520,16 +523,14 @@ public ThreatIntelligenceInformationInner get(String resourceGroupName, String w
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence information object along with {@link Response}.
+     * @return threat intelligence information object.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<ThreatIntelligenceInformationInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String name, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, name, context).block();
+    public ThreatIntelligenceInformationInner get(String resourceGroupName, String workspaceName, String name) {
+        return getWithResponse(resourceGroupName, workspaceName, name, Context.NONE).getValue();
     }
 
     /**
@@ -694,18 +695,21 @@ private Mono<ThreatIntelligenceInformationInner> createAsync(
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
      * @param threatIntelligenceProperties Properties of threat intelligence indicators to create and update.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence information object.
+     * @return threat intelligence information object along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public ThreatIntelligenceInformationInner create(
+    public Response<ThreatIntelligenceInformationInner> createWithResponse(
         String resourceGroupName,
         String workspaceName,
         String name,
-        ThreatIntelligenceIndicatorModel threatIntelligenceProperties) {
-        return createAsync(resourceGroupName, workspaceName, name, threatIntelligenceProperties).block();
+        ThreatIntelligenceIndicatorModel threatIntelligenceProperties,
+        Context context) {
+        return createWithResponseAsync(resourceGroupName, workspaceName, name, threatIntelligenceProperties, context)
+            .block();
     }
 
     /**
@@ -715,21 +719,19 @@ public ThreatIntelligenceInformationInner create(
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
      * @param threatIntelligenceProperties Properties of threat intelligence indicators to create and update.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence information object along with {@link Response}.
+     * @return threat intelligence information object.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<ThreatIntelligenceInformationInner> createWithResponse(
+    public ThreatIntelligenceInformationInner create(
         String resourceGroupName,
         String workspaceName,
         String name,
-        ThreatIntelligenceIndicatorModel threatIntelligenceProperties,
-        Context context) {
-        return createWithResponseAsync(resourceGroupName, workspaceName, name, threatIntelligenceProperties, context)
-            .block();
+        ThreatIntelligenceIndicatorModel threatIntelligenceProperties) {
+        return createWithResponse(resourceGroupName, workspaceName, name, threatIntelligenceProperties, Context.NONE)
+            .getValue();
     }
 
     /**
@@ -857,13 +859,16 @@ private Mono<Void> deleteAsync(String resourceGroupName, String workspaceName, S
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String name) {
-        deleteAsync(resourceGroupName, workspaceName, name).block();
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String name, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, name, context).block();
     }
 
     /**
@@ -872,16 +877,13 @@ public void delete(String resourceGroupName, String workspaceName, String name)
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String name, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, name, context).block();
+    public void delete(String resourceGroupName, String workspaceName, String name) {
+        deleteWithResponse(resourceGroupName, workspaceName, name, Context.NONE);
     }
 
     /**
@@ -1271,17 +1273,22 @@ private Mono<Void> appendTagsAsync(
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
      * @param threatIntelligenceAppendTags The threat intelligence append tags request body.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void appendTags(
+    public Response<Void> appendTagsWithResponse(
         String resourceGroupName,
         String workspaceName,
         String name,
-        ThreatIntelligenceAppendTags threatIntelligenceAppendTags) {
-        appendTagsAsync(resourceGroupName, workspaceName, name, threatIntelligenceAppendTags).block();
+        ThreatIntelligenceAppendTags threatIntelligenceAppendTags,
+        Context context) {
+        return appendTagsWithResponseAsync(
+                resourceGroupName, workspaceName, name, threatIntelligenceAppendTags, context)
+            .block();
     }
 
     /**
@@ -1291,22 +1298,17 @@ public void appendTags(
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
      * @param threatIntelligenceAppendTags The threat intelligence append tags request body.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> appendTagsWithResponse(
+    public void appendTags(
         String resourceGroupName,
         String workspaceName,
         String name,
-        ThreatIntelligenceAppendTags threatIntelligenceAppendTags,
-        Context context) {
-        return appendTagsWithResponseAsync(
-                resourceGroupName, workspaceName, name, threatIntelligenceAppendTags, context)
-            .block();
+        ThreatIntelligenceAppendTags threatIntelligenceAppendTags) {
+        appendTagsWithResponse(resourceGroupName, workspaceName, name, threatIntelligenceAppendTags, Context.NONE);
     }
 
     /**
@@ -1471,18 +1473,22 @@ private Mono<ThreatIntelligenceInformationInner> replaceTagsAsync(
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
      * @param threatIntelligenceReplaceTags Tags in the threat intelligence indicator to be replaced.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence information object.
+     * @return threat intelligence information object along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public ThreatIntelligenceInformationInner replaceTags(
+    public Response<ThreatIntelligenceInformationInner> replaceTagsWithResponse(
         String resourceGroupName,
         String workspaceName,
         String name,
-        ThreatIntelligenceIndicatorModel threatIntelligenceReplaceTags) {
-        return replaceTagsAsync(resourceGroupName, workspaceName, name, threatIntelligenceReplaceTags).block();
+        ThreatIntelligenceIndicatorModel threatIntelligenceReplaceTags,
+        Context context) {
+        return replaceTagsWithResponseAsync(
+                resourceGroupName, workspaceName, name, threatIntelligenceReplaceTags, context)
+            .block();
     }
 
     /**
@@ -1492,22 +1498,20 @@ public ThreatIntelligenceInformationInner replaceTags(
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
      * @param threatIntelligenceReplaceTags Tags in the threat intelligence indicator to be replaced.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence information object along with {@link Response}.
+     * @return threat intelligence information object.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<ThreatIntelligenceInformationInner> replaceTagsWithResponse(
+    public ThreatIntelligenceInformationInner replaceTags(
         String resourceGroupName,
         String workspaceName,
         String name,
-        ThreatIntelligenceIndicatorModel threatIntelligenceReplaceTags,
-        Context context) {
-        return replaceTagsWithResponseAsync(
-                resourceGroupName, workspaceName, name, threatIntelligenceReplaceTags, context)
-            .block();
+        ThreatIntelligenceIndicatorModel threatIntelligenceReplaceTags) {
+        return replaceTagsWithResponse(
+                resourceGroupName, workspaceName, name, threatIntelligenceReplaceTags, Context.NONE)
+            .getValue();
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ThreatIntelligenceIndicatorsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ThreatIntelligenceIndicatorsImpl.java
index ad629fc04fc9..e1dbd4b46918 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ThreatIntelligenceIndicatorsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/ThreatIntelligenceIndicatorsImpl.java
@@ -31,17 +31,6 @@ public ThreatIntelligenceIndicatorsImpl(
         this.serviceManager = serviceManager;
     }
 
-    public ThreatIntelligenceInformation createIndicator(
-        String resourceGroupName, String workspaceName, ThreatIntelligenceIndicatorModel threatIntelligenceProperties) {
-        ThreatIntelligenceInformationInner inner =
-            this.serviceClient().createIndicator(resourceGroupName, workspaceName, threatIntelligenceProperties);
-        if (inner != null) {
-            return new ThreatIntelligenceInformationImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<ThreatIntelligenceInformation> createIndicatorWithResponse(
         String resourceGroupName,
         String workspaceName,
@@ -62,8 +51,10 @@ public Response<ThreatIntelligenceInformation> createIndicatorWithResponse(
         }
     }
 
-    public ThreatIntelligenceInformation get(String resourceGroupName, String workspaceName, String name) {
-        ThreatIntelligenceInformationInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name);
+    public ThreatIntelligenceInformation createIndicator(
+        String resourceGroupName, String workspaceName, ThreatIntelligenceIndicatorModel threatIntelligenceProperties) {
+        ThreatIntelligenceInformationInner inner =
+            this.serviceClient().createIndicator(resourceGroupName, workspaceName, threatIntelligenceProperties);
         if (inner != null) {
             return new ThreatIntelligenceInformationImpl(inner, this.manager());
         } else {
@@ -86,13 +77,8 @@ public Response<ThreatIntelligenceInformation> getWithResponse(
         }
     }
 
-    public ThreatIntelligenceInformation create(
-        String resourceGroupName,
-        String workspaceName,
-        String name,
-        ThreatIntelligenceIndicatorModel threatIntelligenceProperties) {
-        ThreatIntelligenceInformationInner inner =
-            this.serviceClient().create(resourceGroupName, workspaceName, name, threatIntelligenceProperties);
+    public ThreatIntelligenceInformation get(String resourceGroupName, String workspaceName, String name) {
+        ThreatIntelligenceInformationInner inner = this.serviceClient().get(resourceGroupName, workspaceName, name);
         if (inner != null) {
             return new ThreatIntelligenceInformationImpl(inner, this.manager());
         } else {
@@ -121,8 +107,18 @@ public Response<ThreatIntelligenceInformation> createWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String name) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, name);
+    public ThreatIntelligenceInformation create(
+        String resourceGroupName,
+        String workspaceName,
+        String name,
+        ThreatIntelligenceIndicatorModel threatIntelligenceProperties) {
+        ThreatIntelligenceInformationInner inner =
+            this.serviceClient().create(resourceGroupName, workspaceName, name, threatIntelligenceProperties);
+        if (inner != null) {
+            return new ThreatIntelligenceInformationImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -130,6 +126,10 @@ public Response<Void> deleteWithResponse(
         return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, name, context);
     }
 
+    public void delete(String resourceGroupName, String workspaceName, String name) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, name);
+    }
+
     public PagedIterable<ThreatIntelligenceInformation> queryIndicators(
         String resourceGroupName,
         String workspaceName,
@@ -151,14 +151,6 @@ public PagedIterable<ThreatIntelligenceInformation> queryIndicators(
         return Utils.mapPage(inner, inner1 -> new ThreatIntelligenceInformationImpl(inner1, this.manager()));
     }
 
-    public void appendTags(
-        String resourceGroupName,
-        String workspaceName,
-        String name,
-        ThreatIntelligenceAppendTags threatIntelligenceAppendTags) {
-        this.serviceClient().appendTags(resourceGroupName, workspaceName, name, threatIntelligenceAppendTags);
-    }
-
     public Response<Void> appendTagsWithResponse(
         String resourceGroupName,
         String workspaceName,
@@ -170,18 +162,12 @@ public Response<Void> appendTagsWithResponse(
             .appendTagsWithResponse(resourceGroupName, workspaceName, name, threatIntelligenceAppendTags, context);
     }
 
-    public ThreatIntelligenceInformation replaceTags(
+    public void appendTags(
         String resourceGroupName,
         String workspaceName,
         String name,
-        ThreatIntelligenceIndicatorModel threatIntelligenceReplaceTags) {
-        ThreatIntelligenceInformationInner inner =
-            this.serviceClient().replaceTags(resourceGroupName, workspaceName, name, threatIntelligenceReplaceTags);
-        if (inner != null) {
-            return new ThreatIntelligenceInformationImpl(inner, this.manager());
-        } else {
-            return null;
-        }
+        ThreatIntelligenceAppendTags threatIntelligenceAppendTags) {
+        this.serviceClient().appendTags(resourceGroupName, workspaceName, name, threatIntelligenceAppendTags);
     }
 
     public Response<ThreatIntelligenceInformation> replaceTagsWithResponse(
@@ -206,6 +192,20 @@ public Response<ThreatIntelligenceInformation> replaceTagsWithResponse(
         }
     }
 
+    public ThreatIntelligenceInformation replaceTags(
+        String resourceGroupName,
+        String workspaceName,
+        String name,
+        ThreatIntelligenceIndicatorModel threatIntelligenceReplaceTags) {
+        ThreatIntelligenceInformationInner inner =
+            this.serviceClient().replaceTags(resourceGroupName, workspaceName, name, threatIntelligenceReplaceTags);
+        if (inner != null) {
+            return new ThreatIntelligenceInformationImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     private ThreatIntelligenceIndicatorsClient serviceClient() {
         return this.innerClient;
     }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WatchlistItemsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WatchlistItemsClientImpl.java
index 0257b61bfb20..da1d2c89172a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WatchlistItemsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WatchlistItemsClientImpl.java
@@ -525,15 +525,20 @@ private Mono<WatchlistItemInner> getAsync(
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
      * @param watchlistItemId Watchlist Item Id (GUID).
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a watchlist, without its watchlist items.
+     * @return a watchlist, without its watchlist items along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public WatchlistItemInner get(
-        String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId) {
-        return getAsync(resourceGroupName, workspaceName, watchlistAlias, watchlistItemId).block();
+    public Response<WatchlistItemInner> getWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String watchlistAlias,
+        String watchlistItemId,
+        Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, watchlistAlias, watchlistItemId, context).block();
     }
 
     /**
@@ -543,20 +548,16 @@ public WatchlistItemInner get(
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
      * @param watchlistItemId Watchlist Item Id (GUID).
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a watchlist, without its watchlist items along with {@link Response}.
+     * @return a watchlist, without its watchlist items.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<WatchlistItemInner> getWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String watchlistAlias,
-        String watchlistItemId,
-        Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, watchlistAlias, watchlistItemId, context).block();
+    public WatchlistItemInner get(
+        String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId) {
+        return getWithResponse(resourceGroupName, workspaceName, watchlistAlias, watchlistItemId, Context.NONE)
+            .getValue();
     }
 
     /**
@@ -705,13 +706,21 @@ private Mono<Void> deleteAsync(
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
      * @param watchlistItemId Watchlist Item Id (GUID).
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId) {
-        deleteAsync(resourceGroupName, workspaceName, watchlistAlias, watchlistItemId).block();
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String watchlistAlias,
+        String watchlistItemId,
+        Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, watchlistAlias, watchlistItemId, context)
+            .block();
     }
 
     /**
@@ -721,21 +730,13 @@ public void delete(String resourceGroupName, String workspaceName, String watchl
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
      * @param watchlistItemId Watchlist Item Id (GUID).
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> deleteWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String watchlistAlias,
-        String watchlistItemId,
-        Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, watchlistAlias, watchlistItemId, context)
-            .block();
+    public void delete(String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId) {
+        deleteWithResponse(resourceGroupName, workspaceName, watchlistAlias, watchlistItemId, Context.NONE);
     }
 
     /**
@@ -912,19 +913,22 @@ private Mono<WatchlistItemInner> createOrUpdateAsync(
      * @param watchlistAlias Watchlist Alias.
      * @param watchlistItemId Watchlist Item Id (GUID).
      * @param watchlistItem The watchlist item.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a Watchlist item in Azure Security Insights.
+     * @return represents a Watchlist item in Azure Security Insights along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public WatchlistItemInner createOrUpdate(
+    public Response<WatchlistItemInner> createOrUpdateWithResponse(
         String resourceGroupName,
         String workspaceName,
         String watchlistAlias,
         String watchlistItemId,
-        WatchlistItemInner watchlistItem) {
-        return createOrUpdateAsync(resourceGroupName, workspaceName, watchlistAlias, watchlistItemId, watchlistItem)
+        WatchlistItemInner watchlistItem,
+        Context context) {
+        return createOrUpdateWithResponseAsync(
+                resourceGroupName, workspaceName, watchlistAlias, watchlistItemId, watchlistItem, context)
             .block();
     }
 
@@ -936,23 +940,21 @@ public WatchlistItemInner createOrUpdate(
      * @param watchlistAlias Watchlist Alias.
      * @param watchlistItemId Watchlist Item Id (GUID).
      * @param watchlistItem The watchlist item.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a Watchlist item in Azure Security Insights along with {@link Response}.
+     * @return represents a Watchlist item in Azure Security Insights.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<WatchlistItemInner> createOrUpdateWithResponse(
+    public WatchlistItemInner createOrUpdate(
         String resourceGroupName,
         String workspaceName,
         String watchlistAlias,
         String watchlistItemId,
-        WatchlistItemInner watchlistItem,
-        Context context) {
-        return createOrUpdateWithResponseAsync(
-                resourceGroupName, workspaceName, watchlistAlias, watchlistItemId, watchlistItem, context)
-            .block();
+        WatchlistItemInner watchlistItem) {
+        return createOrUpdateWithResponse(
+                resourceGroupName, workspaceName, watchlistAlias, watchlistItemId, watchlistItem, Context.NONE)
+            .getValue();
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WatchlistItemsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WatchlistItemsImpl.java
index fc1cb65f0917..68ce31846010 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WatchlistItemsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WatchlistItemsImpl.java
@@ -41,17 +41,6 @@ public PagedIterable<WatchlistItem> list(
         return Utils.mapPage(inner, inner1 -> new WatchlistItemImpl(inner1, this.manager()));
     }
 
-    public WatchlistItem get(
-        String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId) {
-        WatchlistItemInner inner =
-            this.serviceClient().get(resourceGroupName, workspaceName, watchlistAlias, watchlistItemId);
-        if (inner != null) {
-            return new WatchlistItemImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<WatchlistItem> getWithResponse(
         String resourceGroupName,
         String workspaceName,
@@ -73,8 +62,15 @@ public Response<WatchlistItem> getWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, watchlistAlias, watchlistItemId);
+    public WatchlistItem get(
+        String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId) {
+        WatchlistItemInner inner =
+            this.serviceClient().get(resourceGroupName, workspaceName, watchlistAlias, watchlistItemId);
+        if (inner != null) {
+            return new WatchlistItemImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -88,6 +84,10 @@ public Response<Void> deleteWithResponse(
             .deleteWithResponse(resourceGroupName, workspaceName, watchlistAlias, watchlistItemId, context);
     }
 
+    public void delete(String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, watchlistAlias, watchlistItemId);
+    }
+
     public WatchlistItem getById(String id) {
         String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
         if (resourceGroupName == null) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WatchlistsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WatchlistsClientImpl.java
index 56e2704b1252..c183c43134a7 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WatchlistsClientImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WatchlistsClientImpl.java
@@ -484,14 +484,16 @@ private Mono<WatchlistInner> getAsync(String resourceGroupName, String workspace
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a watchlist, without its watchlist items.
+     * @return a watchlist, without its watchlist items along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public WatchlistInner get(String resourceGroupName, String workspaceName, String watchlistAlias) {
-        return getAsync(resourceGroupName, workspaceName, watchlistAlias).block();
+    public Response<WatchlistInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String watchlistAlias, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, watchlistAlias, context).block();
     }
 
     /**
@@ -500,16 +502,14 @@ public WatchlistInner get(String resourceGroupName, String workspaceName, String
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a watchlist, without its watchlist items along with {@link Response}.
+     * @return a watchlist, without its watchlist items.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<WatchlistInner> getWithResponse(
-        String resourceGroupName, String workspaceName, String watchlistAlias, Context context) {
-        return getWithResponseAsync(resourceGroupName, workspaceName, watchlistAlias, context).block();
+    public WatchlistInner get(String resourceGroupName, String workspaceName, String watchlistAlias) {
+        return getWithResponse(resourceGroupName, workspaceName, watchlistAlias, Context.NONE).getValue();
     }
 
     /**
@@ -639,13 +639,16 @@ private Mono<Void> deleteAsync(String resourceGroupName, String workspaceName, S
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String workspaceName, String watchlistAlias) {
-        deleteAsync(resourceGroupName, workspaceName, watchlistAlias).block();
+    public WatchlistsDeleteResponse deleteWithResponse(
+        String resourceGroupName, String workspaceName, String watchlistAlias, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, watchlistAlias, context).block();
     }
 
     /**
@@ -654,16 +657,13 @@ public void delete(String resourceGroupName, String workspaceName, String watchl
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public WatchlistsDeleteResponse deleteWithResponse(
-        String resourceGroupName, String workspaceName, String watchlistAlias, Context context) {
-        return deleteWithResponseAsync(resourceGroupName, workspaceName, watchlistAlias, context).block();
+    public void delete(String resourceGroupName, String workspaceName, String watchlistAlias) {
+        deleteWithResponse(resourceGroupName, workspaceName, watchlistAlias, Context.NONE);
     }
 
     /**
@@ -830,15 +830,21 @@ private Mono<WatchlistInner> createOrUpdateAsync(
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
      * @param watchlist The watchlist.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Watchlist in Azure Security Insights.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public WatchlistInner createOrUpdate(
-        String resourceGroupName, String workspaceName, String watchlistAlias, WatchlistInner watchlist) {
-        return createOrUpdateAsync(resourceGroupName, workspaceName, watchlistAlias, watchlist).block();
+    public WatchlistsCreateOrUpdateResponse createOrUpdateWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String watchlistAlias,
+        WatchlistInner watchlist,
+        Context context) {
+        return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, watchlistAlias, watchlist, context)
+            .block();
     }
 
     /**
@@ -852,21 +858,16 @@ public WatchlistInner createOrUpdate(
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
      * @param watchlist The watchlist.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Watchlist in Azure Security Insights.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public WatchlistsCreateOrUpdateResponse createOrUpdateWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String watchlistAlias,
-        WatchlistInner watchlist,
-        Context context) {
-        return createOrUpdateWithResponseAsync(resourceGroupName, workspaceName, watchlistAlias, watchlist, context)
-            .block();
+    public WatchlistInner createOrUpdate(
+        String resourceGroupName, String workspaceName, String watchlistAlias, WatchlistInner watchlist) {
+        return createOrUpdateWithResponse(resourceGroupName, workspaceName, watchlistAlias, watchlist, Context.NONE)
+            .getValue();
     }
 
     /**
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WatchlistsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WatchlistsImpl.java
index 139a0477f33f..abfae871fc71 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WatchlistsImpl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WatchlistsImpl.java
@@ -41,15 +41,6 @@ public PagedIterable<Watchlist> list(
         return Utils.mapPage(inner, inner1 -> new WatchlistImpl(inner1, this.manager()));
     }
 
-    public Watchlist get(String resourceGroupName, String workspaceName, String watchlistAlias) {
-        WatchlistInner inner = this.serviceClient().get(resourceGroupName, workspaceName, watchlistAlias);
-        if (inner != null) {
-            return new WatchlistImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<Watchlist> getWithResponse(
         String resourceGroupName, String workspaceName, String watchlistAlias, Context context) {
         Response<WatchlistInner> inner =
@@ -65,8 +56,13 @@ public Response<Watchlist> getWithResponse(
         }
     }
 
-    public void delete(String resourceGroupName, String workspaceName, String watchlistAlias) {
-        this.serviceClient().delete(resourceGroupName, workspaceName, watchlistAlias);
+    public Watchlist get(String resourceGroupName, String workspaceName, String watchlistAlias) {
+        WatchlistInner inner = this.serviceClient().get(resourceGroupName, workspaceName, watchlistAlias);
+        if (inner != null) {
+            return new WatchlistImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public WatchlistsDeleteResponse deleteWithResponse(
@@ -74,6 +70,10 @@ public WatchlistsDeleteResponse deleteWithResponse(
         return this.serviceClient().deleteWithResponse(resourceGroupName, workspaceName, watchlistAlias, context);
     }
 
+    public void delete(String resourceGroupName, String workspaceName, String watchlistAlias) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, watchlistAlias);
+    }
+
     public Watchlist getById(String id) {
         String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
         if (resourceGroupName == null) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WorkspaceManagerConfigurationImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WorkspaceManagerConfigurationImpl.java
new file mode 100644
index 000000000000..2cf75068f996
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WorkspaceManagerConfigurationImpl.java
@@ -0,0 +1,167 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.implementation;
+
+import com.azure.core.management.SystemData;
+import com.azure.core.util.Context;
+import com.azure.resourcemanager.securityinsights.fluent.models.WorkspaceManagerConfigurationInner;
+import com.azure.resourcemanager.securityinsights.models.Mode;
+import com.azure.resourcemanager.securityinsights.models.WorkspaceManagerConfiguration;
+
+public final class WorkspaceManagerConfigurationImpl
+    implements WorkspaceManagerConfiguration,
+        WorkspaceManagerConfiguration.Definition,
+        WorkspaceManagerConfiguration.Update {
+    private WorkspaceManagerConfigurationInner innerObject;
+
+    private final com.azure.resourcemanager.securityinsights.SecurityInsightsManager serviceManager;
+
+    public String id() {
+        return this.innerModel().id();
+    }
+
+    public String name() {
+        return this.innerModel().name();
+    }
+
+    public String type() {
+        return this.innerModel().type();
+    }
+
+    public String etag() {
+        return this.innerModel().etag();
+    }
+
+    public SystemData systemData() {
+        return this.innerModel().systemData();
+    }
+
+    public Mode mode() {
+        return this.innerModel().mode();
+    }
+
+    public String resourceGroupName() {
+        return resourceGroupName;
+    }
+
+    public WorkspaceManagerConfigurationInner innerModel() {
+        return this.innerObject;
+    }
+
+    private com.azure.resourcemanager.securityinsights.SecurityInsightsManager manager() {
+        return this.serviceManager;
+    }
+
+    private String resourceGroupName;
+
+    private String workspaceName;
+
+    private String workspaceManagerConfigurationName;
+
+    public WorkspaceManagerConfigurationImpl withExistingWorkspace(String resourceGroupName, String workspaceName) {
+        this.resourceGroupName = resourceGroupName;
+        this.workspaceName = workspaceName;
+        return this;
+    }
+
+    public WorkspaceManagerConfiguration create() {
+        this.innerObject =
+            serviceManager
+                .serviceClient()
+                .getWorkspaceManagerConfigurations()
+                .createOrUpdateWithResponse(
+                    resourceGroupName,
+                    workspaceName,
+                    workspaceManagerConfigurationName,
+                    this.innerModel(),
+                    Context.NONE)
+                .getValue();
+        return this;
+    }
+
+    public WorkspaceManagerConfiguration create(Context context) {
+        this.innerObject =
+            serviceManager
+                .serviceClient()
+                .getWorkspaceManagerConfigurations()
+                .createOrUpdateWithResponse(
+                    resourceGroupName, workspaceName, workspaceManagerConfigurationName, this.innerModel(), context)
+                .getValue();
+        return this;
+    }
+
+    WorkspaceManagerConfigurationImpl(
+        String name, com.azure.resourcemanager.securityinsights.SecurityInsightsManager serviceManager) {
+        this.innerObject = new WorkspaceManagerConfigurationInner();
+        this.serviceManager = serviceManager;
+        this.workspaceManagerConfigurationName = name;
+    }
+
+    public WorkspaceManagerConfigurationImpl update() {
+        return this;
+    }
+
+    public WorkspaceManagerConfiguration apply() {
+        this.innerObject =
+            serviceManager
+                .serviceClient()
+                .getWorkspaceManagerConfigurations()
+                .createOrUpdateWithResponse(
+                    resourceGroupName,
+                    workspaceName,
+                    workspaceManagerConfigurationName,
+                    this.innerModel(),
+                    Context.NONE)
+                .getValue();
+        return this;
+    }
+
+    public WorkspaceManagerConfiguration apply(Context context) {
+        this.innerObject =
+            serviceManager
+                .serviceClient()
+                .getWorkspaceManagerConfigurations()
+                .createOrUpdateWithResponse(
+                    resourceGroupName, workspaceName, workspaceManagerConfigurationName, this.innerModel(), context)
+                .getValue();
+        return this;
+    }
+
+    WorkspaceManagerConfigurationImpl(
+        WorkspaceManagerConfigurationInner innerObject,
+        com.azure.resourcemanager.securityinsights.SecurityInsightsManager serviceManager) {
+        this.innerObject = innerObject;
+        this.serviceManager = serviceManager;
+        this.resourceGroupName = Utils.getValueFromIdByName(innerObject.id(), "resourceGroups");
+        this.workspaceName = Utils.getValueFromIdByName(innerObject.id(), "workspaces");
+        this.workspaceManagerConfigurationName =
+            Utils.getValueFromIdByName(innerObject.id(), "workspaceManagerConfigurations");
+    }
+
+    public WorkspaceManagerConfiguration refresh() {
+        this.innerObject =
+            serviceManager
+                .serviceClient()
+                .getWorkspaceManagerConfigurations()
+                .getWithResponse(resourceGroupName, workspaceName, workspaceManagerConfigurationName, Context.NONE)
+                .getValue();
+        return this;
+    }
+
+    public WorkspaceManagerConfiguration refresh(Context context) {
+        this.innerObject =
+            serviceManager
+                .serviceClient()
+                .getWorkspaceManagerConfigurations()
+                .getWithResponse(resourceGroupName, workspaceName, workspaceManagerConfigurationName, context)
+                .getValue();
+        return this;
+    }
+
+    public WorkspaceManagerConfigurationImpl withMode(Mode mode) {
+        this.innerModel().withMode(mode);
+        return this;
+    }
+}
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WorkspaceManagerConfigurationsClientImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WorkspaceManagerConfigurationsClientImpl.java
new file mode 100644
index 000000000000..73b69163cbd3
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WorkspaceManagerConfigurationsClientImpl.java
@@ -0,0 +1,1022 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.implementation;
+
+import com.azure.core.annotation.BodyParam;
+import com.azure.core.annotation.Delete;
+import com.azure.core.annotation.ExpectedResponses;
+import com.azure.core.annotation.Get;
+import com.azure.core.annotation.HeaderParam;
+import com.azure.core.annotation.Headers;
+import com.azure.core.annotation.Host;
+import com.azure.core.annotation.HostParam;
+import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.Put;
+import com.azure.core.annotation.QueryParam;
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceInterface;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.PagedResponse;
+import com.azure.core.http.rest.PagedResponseBase;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.RestProxy;
+import com.azure.core.management.exception.ManagementException;
+import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
+import com.azure.resourcemanager.securityinsights.fluent.WorkspaceManagerConfigurationsClient;
+import com.azure.resourcemanager.securityinsights.fluent.models.WorkspaceManagerConfigurationInner;
+import com.azure.resourcemanager.securityinsights.models.WorkspaceManagerConfigurationList;
+import reactor.core.publisher.Mono;
+
+/** An instance of this class provides access to all the operations defined in WorkspaceManagerConfigurationsClient. */
+public final class WorkspaceManagerConfigurationsClientImpl implements WorkspaceManagerConfigurationsClient {
+    /** The proxy service used to perform REST calls. */
+    private final WorkspaceManagerConfigurationsService service;
+
+    /** The service client containing this operation class. */
+    private final SecurityInsightsImpl client;
+
+    /**
+     * Initializes an instance of WorkspaceManagerConfigurationsClientImpl.
+     *
+     * @param client the instance of the service client containing this operation class.
+     */
+    WorkspaceManagerConfigurationsClientImpl(SecurityInsightsImpl client) {
+        this.service =
+            RestProxy
+                .create(
+                    WorkspaceManagerConfigurationsService.class,
+                    client.getHttpPipeline(),
+                    client.getSerializerAdapter());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for SecurityInsightsWorkspaceManagerConfigurations to be used by the
+     * proxy service to perform REST calls.
+     */
+    @Host("{$host}")
+    @ServiceInterface(name = "SecurityInsightsWork")
+    private interface WorkspaceManagerConfigurationsService {
+        @Headers({"Content-Type: application/json"})
+        @Get(
+            "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights"
+                + "/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/workspaceManagerConfigurations")
+        @ExpectedResponses({200})
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<WorkspaceManagerConfigurationList>> list(
+            @HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("workspaceName") String workspaceName,
+            @QueryParam("$orderby") String orderby,
+            @QueryParam("$top") Integer top,
+            @QueryParam("$skipToken") String skipToken,
+            @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({"Content-Type: application/json"})
+        @Get(
+            "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights"
+                + "/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/workspaceManagerConfigurations"
+                + "/{workspaceManagerConfigurationName}")
+        @ExpectedResponses({200})
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<WorkspaceManagerConfigurationInner>> get(
+            @HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("workspaceName") String workspaceName,
+            @PathParam("workspaceManagerConfigurationName") String workspaceManagerConfigurationName,
+            @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({"Content-Type: application/json"})
+        @Delete(
+            "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights"
+                + "/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/workspaceManagerConfigurations"
+                + "/{workspaceManagerConfigurationName}")
+        @ExpectedResponses({200, 204})
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Void>> delete(
+            @HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("workspaceName") String workspaceName,
+            @PathParam("workspaceManagerConfigurationName") String workspaceManagerConfigurationName,
+            @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({"Content-Type: application/json"})
+        @Put(
+            "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights"
+                + "/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/workspaceManagerConfigurations"
+                + "/{workspaceManagerConfigurationName}")
+        @ExpectedResponses({200, 201})
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<WorkspaceManagerConfigurationInner>> createOrUpdate(
+            @HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("workspaceName") String workspaceName,
+            @PathParam("workspaceManagerConfigurationName") String workspaceManagerConfigurationName,
+            @BodyParam("application/json") WorkspaceManagerConfigurationInner workspaceManagerConfiguration,
+            @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({"Content-Type: application/json"})
+        @Get("{nextLink}")
+        @ExpectedResponses({200})
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<WorkspaceManagerConfigurationList>> listNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink,
+            @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept,
+            Context context);
+    }
+
+    /**
+     * Gets all workspace manager configurations for a Sentinel workspace.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param orderby Sorts the results. Optional.
+     * @param top Returns only the first n results. Optional.
+     * @param skipToken Skiptoken is only used if a previous operation returned a partial result. If a previous response
+     *     contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that
+     *     specifies a starting point to use for subsequent calls. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return all workspace manager configurations for a Sentinel workspace along with {@link PagedResponse} on
+     *     successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<WorkspaceManagerConfigurationInner>> listSinglePageAsync(
+        String resourceGroupName, String workspaceName, String orderby, Integer top, String skipToken) {
+        if (this.client.getEndpoint() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (workspaceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context ->
+                    service
+                        .list(
+                            this.client.getEndpoint(),
+                            this.client.getApiVersion(),
+                            this.client.getSubscriptionId(),
+                            resourceGroupName,
+                            workspaceName,
+                            orderby,
+                            top,
+                            skipToken,
+                            accept,
+                            context))
+            .<PagedResponse<WorkspaceManagerConfigurationInner>>map(
+                res ->
+                    new PagedResponseBase<>(
+                        res.getRequest(),
+                        res.getStatusCode(),
+                        res.getHeaders(),
+                        res.getValue().value(),
+                        res.getValue().nextLink(),
+                        null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets all workspace manager configurations for a Sentinel workspace.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param orderby Sorts the results. Optional.
+     * @param top Returns only the first n results. Optional.
+     * @param skipToken Skiptoken is only used if a previous operation returned a partial result. If a previous response
+     *     contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that
+     *     specifies a starting point to use for subsequent calls. Optional.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return all workspace manager configurations for a Sentinel workspace along with {@link PagedResponse} on
+     *     successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<WorkspaceManagerConfigurationInner>> listSinglePageAsync(
+        String resourceGroupName,
+        String workspaceName,
+        String orderby,
+        Integer top,
+        String skipToken,
+        Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (workspaceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service
+            .list(
+                this.client.getEndpoint(),
+                this.client.getApiVersion(),
+                this.client.getSubscriptionId(),
+                resourceGroupName,
+                workspaceName,
+                orderby,
+                top,
+                skipToken,
+                accept,
+                context)
+            .map(
+                res ->
+                    new PagedResponseBase<>(
+                        res.getRequest(),
+                        res.getStatusCode(),
+                        res.getHeaders(),
+                        res.getValue().value(),
+                        res.getValue().nextLink(),
+                        null));
+    }
+
+    /**
+     * Gets all workspace manager configurations for a Sentinel workspace.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param orderby Sorts the results. Optional.
+     * @param top Returns only the first n results. Optional.
+     * @param skipToken Skiptoken is only used if a previous operation returned a partial result. If a previous response
+     *     contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that
+     *     specifies a starting point to use for subsequent calls. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return all workspace manager configurations for a Sentinel workspace as paginated response with {@link
+     *     PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<WorkspaceManagerConfigurationInner> listAsync(
+        String resourceGroupName, String workspaceName, String orderby, Integer top, String skipToken) {
+        return new PagedFlux<>(
+            () -> listSinglePageAsync(resourceGroupName, workspaceName, orderby, top, skipToken),
+            nextLink -> listNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * Gets all workspace manager configurations for a Sentinel workspace.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return all workspace manager configurations for a Sentinel workspace as paginated response with {@link
+     *     PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<WorkspaceManagerConfigurationInner> listAsync(String resourceGroupName, String workspaceName) {
+        final String orderby = null;
+        final Integer top = null;
+        final String skipToken = null;
+        return new PagedFlux<>(
+            () -> listSinglePageAsync(resourceGroupName, workspaceName, orderby, top, skipToken),
+            nextLink -> listNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * Gets all workspace manager configurations for a Sentinel workspace.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param orderby Sorts the results. Optional.
+     * @param top Returns only the first n results. Optional.
+     * @param skipToken Skiptoken is only used if a previous operation returned a partial result. If a previous response
+     *     contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that
+     *     specifies a starting point to use for subsequent calls. Optional.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return all workspace manager configurations for a Sentinel workspace as paginated response with {@link
+     *     PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<WorkspaceManagerConfigurationInner> listAsync(
+        String resourceGroupName,
+        String workspaceName,
+        String orderby,
+        Integer top,
+        String skipToken,
+        Context context) {
+        return new PagedFlux<>(
+            () -> listSinglePageAsync(resourceGroupName, workspaceName, orderby, top, skipToken, context),
+            nextLink -> listNextSinglePageAsync(nextLink, context));
+    }
+
+    /**
+     * Gets all workspace manager configurations for a Sentinel workspace.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return all workspace manager configurations for a Sentinel workspace as paginated response with {@link
+     *     PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<WorkspaceManagerConfigurationInner> list(String resourceGroupName, String workspaceName) {
+        final String orderby = null;
+        final Integer top = null;
+        final String skipToken = null;
+        return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, orderby, top, skipToken));
+    }
+
+    /**
+     * Gets all workspace manager configurations for a Sentinel workspace.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param orderby Sorts the results. Optional.
+     * @param top Returns only the first n results. Optional.
+     * @param skipToken Skiptoken is only used if a previous operation returned a partial result. If a previous response
+     *     contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that
+     *     specifies a starting point to use for subsequent calls. Optional.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return all workspace manager configurations for a Sentinel workspace as paginated response with {@link
+     *     PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<WorkspaceManagerConfigurationInner> list(
+        String resourceGroupName,
+        String workspaceName,
+        String orderby,
+        Integer top,
+        String skipToken,
+        Context context) {
+        return new PagedIterable<>(listAsync(resourceGroupName, workspaceName, orderby, top, skipToken, context));
+    }
+
+    /**
+     * Gets a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a workspace manager configuration along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<WorkspaceManagerConfigurationInner>> getWithResponseAsync(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (workspaceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null."));
+        }
+        if (workspaceManagerConfigurationName == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter workspaceManagerConfigurationName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context ->
+                    service
+                        .get(
+                            this.client.getEndpoint(),
+                            this.client.getApiVersion(),
+                            this.client.getSubscriptionId(),
+                            resourceGroupName,
+                            workspaceName,
+                            workspaceManagerConfigurationName,
+                            accept,
+                            context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a workspace manager configuration along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<WorkspaceManagerConfigurationInner>> getWithResponseAsync(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (workspaceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null."));
+        }
+        if (workspaceManagerConfigurationName == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter workspaceManagerConfigurationName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service
+            .get(
+                this.client.getEndpoint(),
+                this.client.getApiVersion(),
+                this.client.getSubscriptionId(),
+                resourceGroupName,
+                workspaceName,
+                workspaceManagerConfigurationName,
+                accept,
+                context);
+    }
+
+    /**
+     * Gets a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a workspace manager configuration on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<WorkspaceManagerConfigurationInner> getAsync(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, workspaceManagerConfigurationName)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Gets a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a workspace manager configuration along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<WorkspaceManagerConfigurationInner> getWithResponse(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName, Context context) {
+        return getWithResponseAsync(resourceGroupName, workspaceName, workspaceManagerConfigurationName, context)
+            .block();
+    }
+
+    /**
+     * Gets a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a workspace manager configuration.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public WorkspaceManagerConfigurationInner get(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName) {
+        return getWithResponse(resourceGroupName, workspaceName, workspaceManagerConfigurationName, Context.NONE)
+            .getValue();
+    }
+
+    /**
+     * Deletes a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Void>> deleteWithResponseAsync(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (workspaceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null."));
+        }
+        if (workspaceManagerConfigurationName == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter workspaceManagerConfigurationName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context ->
+                    service
+                        .delete(
+                            this.client.getEndpoint(),
+                            this.client.getApiVersion(),
+                            this.client.getSubscriptionId(),
+                            resourceGroupName,
+                            workspaceName,
+                            workspaceManagerConfigurationName,
+                            accept,
+                            context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Deletes a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Void>> deleteWithResponseAsync(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (workspaceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null."));
+        }
+        if (workspaceManagerConfigurationName == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter workspaceManagerConfigurationName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service
+            .delete(
+                this.client.getEndpoint(),
+                this.client.getApiVersion(),
+                this.client.getSubscriptionId(),
+                resourceGroupName,
+                workspaceName,
+                workspaceManagerConfigurationName,
+                accept,
+                context);
+    }
+
+    /**
+     * Deletes a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Void> deleteAsync(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, workspaceManagerConfigurationName)
+            .flatMap(ignored -> Mono.empty());
+    }
+
+    /**
+     * Deletes a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, workspaceName, workspaceManagerConfigurationName, context)
+            .block();
+    }
+
+    /**
+     * Deletes a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName) {
+        deleteWithResponse(resourceGroupName, workspaceName, workspaceManagerConfigurationName, Context.NONE);
+    }
+
+    /**
+     * Creates or updates a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @param workspaceManagerConfiguration The workspace manager configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the workspace manager configuration along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<WorkspaceManagerConfigurationInner>> createOrUpdateWithResponseAsync(
+        String resourceGroupName,
+        String workspaceName,
+        String workspaceManagerConfigurationName,
+        WorkspaceManagerConfigurationInner workspaceManagerConfiguration) {
+        if (this.client.getEndpoint() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (workspaceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null."));
+        }
+        if (workspaceManagerConfigurationName == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter workspaceManagerConfigurationName is required and cannot be null."));
+        }
+        if (workspaceManagerConfiguration == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter workspaceManagerConfiguration is required and cannot be null."));
+        } else {
+            workspaceManagerConfiguration.validate();
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context ->
+                    service
+                        .createOrUpdate(
+                            this.client.getEndpoint(),
+                            this.client.getApiVersion(),
+                            this.client.getSubscriptionId(),
+                            resourceGroupName,
+                            workspaceName,
+                            workspaceManagerConfigurationName,
+                            workspaceManagerConfiguration,
+                            accept,
+                            context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Creates or updates a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @param workspaceManagerConfiguration The workspace manager configuration.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the workspace manager configuration along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<WorkspaceManagerConfigurationInner>> createOrUpdateWithResponseAsync(
+        String resourceGroupName,
+        String workspaceName,
+        String workspaceManagerConfigurationName,
+        WorkspaceManagerConfigurationInner workspaceManagerConfiguration,
+        Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (workspaceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null."));
+        }
+        if (workspaceManagerConfigurationName == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter workspaceManagerConfigurationName is required and cannot be null."));
+        }
+        if (workspaceManagerConfiguration == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter workspaceManagerConfiguration is required and cannot be null."));
+        } else {
+            workspaceManagerConfiguration.validate();
+        }
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service
+            .createOrUpdate(
+                this.client.getEndpoint(),
+                this.client.getApiVersion(),
+                this.client.getSubscriptionId(),
+                resourceGroupName,
+                workspaceName,
+                workspaceManagerConfigurationName,
+                workspaceManagerConfiguration,
+                accept,
+                context);
+    }
+
+    /**
+     * Creates or updates a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @param workspaceManagerConfiguration The workspace manager configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the workspace manager configuration on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<WorkspaceManagerConfigurationInner> createOrUpdateAsync(
+        String resourceGroupName,
+        String workspaceName,
+        String workspaceManagerConfigurationName,
+        WorkspaceManagerConfigurationInner workspaceManagerConfiguration) {
+        return createOrUpdateWithResponseAsync(
+                resourceGroupName, workspaceName, workspaceManagerConfigurationName, workspaceManagerConfiguration)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Creates or updates a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @param workspaceManagerConfiguration The workspace manager configuration.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the workspace manager configuration along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<WorkspaceManagerConfigurationInner> createOrUpdateWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String workspaceManagerConfigurationName,
+        WorkspaceManagerConfigurationInner workspaceManagerConfiguration,
+        Context context) {
+        return createOrUpdateWithResponseAsync(
+                resourceGroupName,
+                workspaceName,
+                workspaceManagerConfigurationName,
+                workspaceManagerConfiguration,
+                context)
+            .block();
+    }
+
+    /**
+     * Creates or updates a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @param workspaceManagerConfiguration The workspace manager configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the workspace manager configuration.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public WorkspaceManagerConfigurationInner createOrUpdate(
+        String resourceGroupName,
+        String workspaceName,
+        String workspaceManagerConfigurationName,
+        WorkspaceManagerConfigurationInner workspaceManagerConfiguration) {
+        return createOrUpdateWithResponse(
+                resourceGroupName,
+                workspaceName,
+                workspaceManagerConfigurationName,
+                workspaceManagerConfiguration,
+                Context.NONE)
+            .getValue();
+    }
+
+    /**
+     * Get the next page of items.
+     *
+     * @param nextLink The URL to get the next list of items
+     *     <p>The nextLink parameter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list all the workspace manager configurations for the workspace along with {@link PagedResponse} on
+     *     successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<WorkspaceManagerConfigurationInner>> listNextSinglePageAsync(String nextLink) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<WorkspaceManagerConfigurationInner>>map(
+                res ->
+                    new PagedResponseBase<>(
+                        res.getRequest(),
+                        res.getStatusCode(),
+                        res.getHeaders(),
+                        res.getValue().value(),
+                        res.getValue().nextLink(),
+                        null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Get the next page of items.
+     *
+     * @param nextLink The URL to get the next list of items
+     *     <p>The nextLink parameter.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list all the workspace manager configurations for the workspace along with {@link PagedResponse} on
+     *     successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<WorkspaceManagerConfigurationInner>> listNextSinglePageAsync(
+        String nextLink, Context context) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono
+                .error(
+                    new IllegalArgumentException(
+                        "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service
+            .listNext(nextLink, this.client.getEndpoint(), accept, context)
+            .map(
+                res ->
+                    new PagedResponseBase<>(
+                        res.getRequest(),
+                        res.getStatusCode(),
+                        res.getHeaders(),
+                        res.getValue().value(),
+                        res.getValue().nextLink(),
+                        null));
+    }
+}
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WorkspaceManagerConfigurationsImpl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WorkspaceManagerConfigurationsImpl.java
new file mode 100644
index 000000000000..c7451a49da4d
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/implementation/WorkspaceManagerConfigurationsImpl.java
@@ -0,0 +1,221 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.implementation;
+
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.SimpleResponse;
+import com.azure.core.util.Context;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.resourcemanager.securityinsights.fluent.WorkspaceManagerConfigurationsClient;
+import com.azure.resourcemanager.securityinsights.fluent.models.WorkspaceManagerConfigurationInner;
+import com.azure.resourcemanager.securityinsights.models.WorkspaceManagerConfiguration;
+import com.azure.resourcemanager.securityinsights.models.WorkspaceManagerConfigurations;
+
+public final class WorkspaceManagerConfigurationsImpl implements WorkspaceManagerConfigurations {
+    private static final ClientLogger LOGGER = new ClientLogger(WorkspaceManagerConfigurationsImpl.class);
+
+    private final WorkspaceManagerConfigurationsClient innerClient;
+
+    private final com.azure.resourcemanager.securityinsights.SecurityInsightsManager serviceManager;
+
+    public WorkspaceManagerConfigurationsImpl(
+        WorkspaceManagerConfigurationsClient innerClient,
+        com.azure.resourcemanager.securityinsights.SecurityInsightsManager serviceManager) {
+        this.innerClient = innerClient;
+        this.serviceManager = serviceManager;
+    }
+
+    public PagedIterable<WorkspaceManagerConfiguration> list(String resourceGroupName, String workspaceName) {
+        PagedIterable<WorkspaceManagerConfigurationInner> inner =
+            this.serviceClient().list(resourceGroupName, workspaceName);
+        return Utils.mapPage(inner, inner1 -> new WorkspaceManagerConfigurationImpl(inner1, this.manager()));
+    }
+
+    public PagedIterable<WorkspaceManagerConfiguration> list(
+        String resourceGroupName,
+        String workspaceName,
+        String orderby,
+        Integer top,
+        String skipToken,
+        Context context) {
+        PagedIterable<WorkspaceManagerConfigurationInner> inner =
+            this.serviceClient().list(resourceGroupName, workspaceName, orderby, top, skipToken, context);
+        return Utils.mapPage(inner, inner1 -> new WorkspaceManagerConfigurationImpl(inner1, this.manager()));
+    }
+
+    public Response<WorkspaceManagerConfiguration> getWithResponse(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName, Context context) {
+        Response<WorkspaceManagerConfigurationInner> inner =
+            this
+                .serviceClient()
+                .getWithResponse(resourceGroupName, workspaceName, workspaceManagerConfigurationName, context);
+        if (inner != null) {
+            return new SimpleResponse<>(
+                inner.getRequest(),
+                inner.getStatusCode(),
+                inner.getHeaders(),
+                new WorkspaceManagerConfigurationImpl(inner.getValue(), this.manager()));
+        } else {
+            return null;
+        }
+    }
+
+    public WorkspaceManagerConfiguration get(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName) {
+        WorkspaceManagerConfigurationInner inner =
+            this.serviceClient().get(resourceGroupName, workspaceName, workspaceManagerConfigurationName);
+        if (inner != null) {
+            return new WorkspaceManagerConfigurationImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
+    public Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName, Context context) {
+        return this
+            .serviceClient()
+            .deleteWithResponse(resourceGroupName, workspaceName, workspaceManagerConfigurationName, context);
+    }
+
+    public void delete(String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName) {
+        this.serviceClient().delete(resourceGroupName, workspaceName, workspaceManagerConfigurationName);
+    }
+
+    public WorkspaceManagerConfiguration getById(String id) {
+        String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER
+                .logExceptionAsError(
+                    new IllegalArgumentException(
+                        String
+                            .format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String workspaceName = Utils.getValueFromIdByName(id, "workspaces");
+        if (workspaceName == null) {
+            throw LOGGER
+                .logExceptionAsError(
+                    new IllegalArgumentException(
+                        String.format("The resource ID '%s' is not valid. Missing path segment 'workspaces'.", id)));
+        }
+        String workspaceManagerConfigurationName = Utils.getValueFromIdByName(id, "workspaceManagerConfigurations");
+        if (workspaceManagerConfigurationName == null) {
+            throw LOGGER
+                .logExceptionAsError(
+                    new IllegalArgumentException(
+                        String
+                            .format(
+                                "The resource ID '%s' is not valid. Missing path segment"
+                                    + " 'workspaceManagerConfigurations'.",
+                                id)));
+        }
+        return this
+            .getWithResponse(resourceGroupName, workspaceName, workspaceManagerConfigurationName, Context.NONE)
+            .getValue();
+    }
+
+    public Response<WorkspaceManagerConfiguration> getByIdWithResponse(String id, Context context) {
+        String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER
+                .logExceptionAsError(
+                    new IllegalArgumentException(
+                        String
+                            .format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String workspaceName = Utils.getValueFromIdByName(id, "workspaces");
+        if (workspaceName == null) {
+            throw LOGGER
+                .logExceptionAsError(
+                    new IllegalArgumentException(
+                        String.format("The resource ID '%s' is not valid. Missing path segment 'workspaces'.", id)));
+        }
+        String workspaceManagerConfigurationName = Utils.getValueFromIdByName(id, "workspaceManagerConfigurations");
+        if (workspaceManagerConfigurationName == null) {
+            throw LOGGER
+                .logExceptionAsError(
+                    new IllegalArgumentException(
+                        String
+                            .format(
+                                "The resource ID '%s' is not valid. Missing path segment"
+                                    + " 'workspaceManagerConfigurations'.",
+                                id)));
+        }
+        return this.getWithResponse(resourceGroupName, workspaceName, workspaceManagerConfigurationName, context);
+    }
+
+    public void deleteById(String id) {
+        String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER
+                .logExceptionAsError(
+                    new IllegalArgumentException(
+                        String
+                            .format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String workspaceName = Utils.getValueFromIdByName(id, "workspaces");
+        if (workspaceName == null) {
+            throw LOGGER
+                .logExceptionAsError(
+                    new IllegalArgumentException(
+                        String.format("The resource ID '%s' is not valid. Missing path segment 'workspaces'.", id)));
+        }
+        String workspaceManagerConfigurationName = Utils.getValueFromIdByName(id, "workspaceManagerConfigurations");
+        if (workspaceManagerConfigurationName == null) {
+            throw LOGGER
+                .logExceptionAsError(
+                    new IllegalArgumentException(
+                        String
+                            .format(
+                                "The resource ID '%s' is not valid. Missing path segment"
+                                    + " 'workspaceManagerConfigurations'.",
+                                id)));
+        }
+        this.deleteWithResponse(resourceGroupName, workspaceName, workspaceManagerConfigurationName, Context.NONE);
+    }
+
+    public Response<Void> deleteByIdWithResponse(String id, Context context) {
+        String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER
+                .logExceptionAsError(
+                    new IllegalArgumentException(
+                        String
+                            .format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String workspaceName = Utils.getValueFromIdByName(id, "workspaces");
+        if (workspaceName == null) {
+            throw LOGGER
+                .logExceptionAsError(
+                    new IllegalArgumentException(
+                        String.format("The resource ID '%s' is not valid. Missing path segment 'workspaces'.", id)));
+        }
+        String workspaceManagerConfigurationName = Utils.getValueFromIdByName(id, "workspaceManagerConfigurations");
+        if (workspaceManagerConfigurationName == null) {
+            throw LOGGER
+                .logExceptionAsError(
+                    new IllegalArgumentException(
+                        String
+                            .format(
+                                "The resource ID '%s' is not valid. Missing path segment"
+                                    + " 'workspaceManagerConfigurations'.",
+                                id)));
+        }
+        return this.deleteWithResponse(resourceGroupName, workspaceName, workspaceManagerConfigurationName, context);
+    }
+
+    private WorkspaceManagerConfigurationsClient serviceClient() {
+        return this.innerClient;
+    }
+
+    private com.azure.resourcemanager.securityinsights.SecurityInsightsManager manager() {
+        return this.serviceManager;
+    }
+
+    public WorkspaceManagerConfigurationImpl define(String name) {
+        return new WorkspaceManagerConfigurationImpl(name, this.manager());
+    }
+}
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AadCheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AadCheckRequirements.java
index bf95fed22e28..02ea0fe7ff43 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AadCheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AadCheckRequirements.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.AadCheckRequirementsProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -13,7 +13,7 @@
 /** Represents AAD (Azure Active Directory) requirements check request. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("AzureActiveDirectory")
-@Fluent
+@Immutable
 public final class AadCheckRequirements extends DataConnectorsCheckRequirements {
     /*
      * AAD (Azure Active Directory) requirements check properties.
@@ -21,6 +21,10 @@ public final class AadCheckRequirements extends DataConnectorsCheckRequirements
     @JsonProperty(value = "properties")
     private AadCheckRequirementsProperties innerProperties;
 
+    /** Creates an instance of AadCheckRequirements class. */
+    public AadCheckRequirements() {
+    }
+
     /**
      * Get the innerProperties property: AAD (Azure Active Directory) requirements check properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AadDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AadDataConnector.java
index 2c2d4b0f24aa..1ae6ffbfd613 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AadDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AadDataConnector.java
@@ -22,6 +22,10 @@ public final class AadDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private AadDataConnectorProperties innerProperties;
 
+    /** Creates an instance of AadDataConnector class. */
+    public AadDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: AAD (Azure Active Directory) data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AatpCheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AatpCheckRequirements.java
index 45cdb56dc88a..6af9edc56b94 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AatpCheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AatpCheckRequirements.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.AatpCheckRequirementsProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -13,7 +13,7 @@
 /** Represents AATP (Azure Advanced Threat Protection) requirements check request. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("AzureAdvancedThreatProtection")
-@Fluent
+@Immutable
 public final class AatpCheckRequirements extends DataConnectorsCheckRequirements {
     /*
      * AATP (Azure Advanced Threat Protection) requirements check properties.
@@ -21,6 +21,10 @@ public final class AatpCheckRequirements extends DataConnectorsCheckRequirements
     @JsonProperty(value = "properties")
     private AatpCheckRequirementsProperties innerProperties;
 
+    /** Creates an instance of AatpCheckRequirements class. */
+    public AatpCheckRequirements() {
+    }
+
     /**
      * Get the innerProperties property: AATP (Azure Advanced Threat Protection) requirements check properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AatpDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AatpDataConnector.java
index 25261e2030c4..4f8ff9e2cac3 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AatpDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AatpDataConnector.java
@@ -22,6 +22,10 @@ public final class AatpDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private AatpDataConnectorProperties innerProperties;
 
+    /** Creates an instance of AatpDataConnector class. */
+    public AatpDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: AATP (Azure Advanced Threat Protection) data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AccountEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AccountEntity.java
index d662cdb888ec..16a379b3ba68 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AccountEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AccountEntity.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.AccountEntityProperties;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityInner;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -16,7 +16,7 @@
 /** Represents an account entity. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("Account")
-@Fluent
+@Immutable
 public final class AccountEntity extends EntityInner {
     /*
      * Account entity properties
@@ -24,6 +24,10 @@ public final class AccountEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private AccountEntityProperties innerProperties;
 
+    /** Creates an instance of AccountEntity class. */
+    public AccountEntity() {
+    }
+
     /**
      * Get the innerProperties property: Account entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActionPropertiesBase.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActionPropertiesBase.java
index 385e767940bd..17fc2338ded8 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActionPropertiesBase.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActionPropertiesBase.java
@@ -18,6 +18,10 @@ public class ActionPropertiesBase {
     @JsonProperty(value = "logicAppResourceId", required = true)
     private String logicAppResourceId;
 
+    /** Creates an instance of ActionPropertiesBase class. */
+    public ActionPropertiesBase() {
+    }
+
     /**
      * Get the logicAppResourceId property: Logic App Resource Id,
      * /subscriptions/{my-subscription}/resourceGroups/{my-resource-group}/providers/Microsoft.Logic/workflows/{my-workflow-id}.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActionRequest.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActionRequest.java
index ccc8692cff41..036949c4ad3c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActionRequest.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActionRequest.java
@@ -17,6 +17,10 @@ public final class ActionRequest extends ResourceWithEtag {
     @JsonProperty(value = "properties")
     private ActionRequestProperties innerProperties;
 
+    /** Creates an instance of ActionRequest class. */
+    public ActionRequest() {
+    }
+
     /**
      * Get the innerProperties property: Action properties for put request.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Actions.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Actions.java
index 97de0d03303b..45591fc7f1ee 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Actions.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Actions.java
@@ -45,12 +45,14 @@ PagedIterable<ActionResponse> listByAlertRule(
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
      * @param actionId Action ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the action of alert rule.
+     * @return the action of alert rule along with {@link Response}.
      */
-    ActionResponse get(String resourceGroupName, String workspaceName, String ruleId, String actionId);
+    Response<ActionResponse> getWithResponse(
+        String resourceGroupName, String workspaceName, String ruleId, String actionId, Context context);
 
     /**
      * Gets the action of alert rule.
@@ -59,14 +61,12 @@ PagedIterable<ActionResponse> listByAlertRule(
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
      * @param actionId Action ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the action of alert rule along with {@link Response}.
+     * @return the action of alert rule.
      */
-    Response<ActionResponse> getWithResponse(
-        String resourceGroupName, String workspaceName, String ruleId, String actionId, Context context);
+    ActionResponse get(String resourceGroupName, String workspaceName, String ruleId, String actionId);
 
     /**
      * Delete the action of alert rule.
@@ -75,11 +75,14 @@ Response<ActionResponse> getWithResponse(
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
      * @param actionId Action ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
-    void delete(String resourceGroupName, String workspaceName, String ruleId, String actionId);
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String ruleId, String actionId, Context context);
 
     /**
      * Delete the action of alert rule.
@@ -88,14 +91,11 @@ Response<ActionResponse> getWithResponse(
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
      * @param actionId Action ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
-    Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String ruleId, String actionId, Context context);
+    void delete(String resourceGroupName, String workspaceName, String ruleId, String actionId);
 
     /**
      * Gets the action of alert rule.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActionsList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActionsList.java
index 4f7ecdd353b9..f9dd5b49803f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActionsList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActionsList.java
@@ -25,6 +25,10 @@ public final class ActionsList {
     @JsonProperty(value = "value", required = true)
     private List<ActionResponseInner> value;
 
+    /** Creates an instance of ActionsList class. */
+    public ActionsList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of actions.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityCustomEntityQuery.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityCustomEntityQuery.java
index e010a8c88c2a..92fb2f214a51 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityCustomEntityQuery.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityCustomEntityQuery.java
@@ -24,6 +24,10 @@ public final class ActivityCustomEntityQuery extends CustomEntityQuery {
     @JsonProperty(value = "properties")
     private ActivityEntityQueriesProperties innerProperties;
 
+    /** Creates an instance of ActivityCustomEntityQuery class. */
+    public ActivityCustomEntityQuery() {
+    }
+
     /**
      * Get the innerProperties property: Activity entity query properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityEntityQueriesPropertiesQueryDefinitions.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityEntityQueriesPropertiesQueryDefinitions.java
index 610d4eff8d46..98716b887d1b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityEntityQueriesPropertiesQueryDefinitions.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityEntityQueriesPropertiesQueryDefinitions.java
@@ -16,6 +16,10 @@ public final class ActivityEntityQueriesPropertiesQueryDefinitions {
     @JsonProperty(value = "query")
     private String query;
 
+    /** Creates an instance of ActivityEntityQueriesPropertiesQueryDefinitions class. */
+    public ActivityEntityQueriesPropertiesQueryDefinitions() {
+    }
+
     /**
      * Get the query property: The Activity query to run on a given entity.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityEntityQuery.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityEntityQuery.java
index 7aadce92dcd4..7fa20beb0131 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityEntityQuery.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityEntityQuery.java
@@ -25,6 +25,10 @@ public final class ActivityEntityQuery extends EntityQueryInner {
     @JsonProperty(value = "properties")
     private ActivityEntityQueriesProperties innerProperties;
 
+    /** Creates an instance of ActivityEntityQuery class. */
+    public ActivityEntityQuery() {
+    }
+
     /**
      * Get the innerProperties property: Activity entity query properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityEntityQueryTemplate.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityEntityQueryTemplate.java
index 9066b404574c..d0329a5167b1 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityEntityQueryTemplate.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityEntityQueryTemplate.java
@@ -24,6 +24,10 @@ public final class ActivityEntityQueryTemplate extends EntityQueryTemplateInner
     @JsonProperty(value = "properties")
     private ActivityEntityQueryTemplateProperties innerProperties;
 
+    /** Creates an instance of ActivityEntityQueryTemplate class. */
+    public ActivityEntityQueryTemplate() {
+    }
+
     /**
      * Get the innerProperties property: Activity entity query properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityEntityQueryTemplatePropertiesQueryDefinitions.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityEntityQueryTemplatePropertiesQueryDefinitions.java
index 9a85f95ebfa3..002b707261d0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityEntityQueryTemplatePropertiesQueryDefinitions.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityEntityQueryTemplatePropertiesQueryDefinitions.java
@@ -22,6 +22,10 @@ public final class ActivityEntityQueryTemplatePropertiesQueryDefinitions {
     @JsonProperty(value = "summarizeBy")
     private String summarizeBy;
 
+    /** Creates an instance of ActivityEntityQueryTemplatePropertiesQueryDefinitions class. */
+    public ActivityEntityQueryTemplatePropertiesQueryDefinitions() {
+    }
+
     /**
      * Get the query property: The Activity query to run on a given entity.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityTimelineItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityTimelineItem.java
index 1e6b52c71395..1462017662ef 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityTimelineItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ActivityTimelineItem.java
@@ -58,6 +58,10 @@ public final class ActivityTimelineItem extends EntityTimelineItem {
     @JsonProperty(value = "title", required = true)
     private String title;
 
+    /** Creates an instance of ActivityTimelineItem class. */
+    public ActivityTimelineItem() {
+    }
+
     /**
      * Get the queryId property: The activity query id.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertDetailsOverride.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertDetailsOverride.java
index 6abe8f54b47d..0a9021a4f1ab 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertDetailsOverride.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertDetailsOverride.java
@@ -6,6 +6,7 @@
 
 import com.azure.core.annotation.Fluent;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
 
 /** Settings for how to dynamically override alert static details. */
 @Fluent
@@ -34,6 +35,16 @@ public final class AlertDetailsOverride {
     @JsonProperty(value = "alertSeverityColumnName")
     private String alertSeverityColumnName;
 
+    /*
+     * List of additional dynamic properties to override
+     */
+    @JsonProperty(value = "alertDynamicProperties")
+    private List<AlertPropertyMapping> alertDynamicProperties;
+
+    /** Creates an instance of AlertDetailsOverride class. */
+    public AlertDetailsOverride() {
+    }
+
     /**
      * Get the alertDisplayNameFormat property: the format containing columns name(s) to override the alert name.
      *
@@ -114,11 +125,34 @@ public AlertDetailsOverride withAlertSeverityColumnName(String alertSeverityColu
         return this;
     }
 
+    /**
+     * Get the alertDynamicProperties property: List of additional dynamic properties to override.
+     *
+     * @return the alertDynamicProperties value.
+     */
+    public List<AlertPropertyMapping> alertDynamicProperties() {
+        return this.alertDynamicProperties;
+    }
+
+    /**
+     * Set the alertDynamicProperties property: List of additional dynamic properties to override.
+     *
+     * @param alertDynamicProperties the alertDynamicProperties value to set.
+     * @return the AlertDetailsOverride object itself.
+     */
+    public AlertDetailsOverride withAlertDynamicProperties(List<AlertPropertyMapping> alertDynamicProperties) {
+        this.alertDynamicProperties = alertDynamicProperties;
+        return this;
+    }
+
     /**
      * Validates the instance.
      *
      * @throws IllegalArgumentException thrown if the instance is not valid.
      */
     public void validate() {
+        if (alertDynamicProperties() != null) {
+            alertDynamicProperties().forEach(e -> e.validate());
+        }
     }
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertProperty.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertProperty.java
new file mode 100644
index 000000000000..3ba556e5037c
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertProperty.java
@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.util.Collection;
+
+/** The V3 alert property. */
+public final class AlertProperty extends ExpandableStringEnum<AlertProperty> {
+    /** Static value AlertLink for AlertProperty. */
+    public static final AlertProperty ALERT_LINK = fromString("AlertLink");
+
+    /** Static value ConfidenceLevel for AlertProperty. */
+    public static final AlertProperty CONFIDENCE_LEVEL = fromString("ConfidenceLevel");
+
+    /** Static value ConfidenceScore for AlertProperty. */
+    public static final AlertProperty CONFIDENCE_SCORE = fromString("ConfidenceScore");
+
+    /** Static value ExtendedLinks for AlertProperty. */
+    public static final AlertProperty EXTENDED_LINKS = fromString("ExtendedLinks");
+
+    /** Static value ProductName for AlertProperty. */
+    public static final AlertProperty PRODUCT_NAME = fromString("ProductName");
+
+    /** Static value ProviderName for AlertProperty. */
+    public static final AlertProperty PROVIDER_NAME = fromString("ProviderName");
+
+    /** Static value ProductComponentName for AlertProperty. */
+    public static final AlertProperty PRODUCT_COMPONENT_NAME = fromString("ProductComponentName");
+
+    /** Static value RemediationSteps for AlertProperty. */
+    public static final AlertProperty REMEDIATION_STEPS = fromString("RemediationSteps");
+
+    /** Static value Techniques for AlertProperty. */
+    public static final AlertProperty TECHNIQUES = fromString("Techniques");
+
+    /**
+     * Creates or finds a AlertProperty from its string representation.
+     *
+     * @param name a name to look for.
+     * @return the corresponding AlertProperty.
+     */
+    @JsonCreator
+    public static AlertProperty fromString(String name) {
+        return fromString(name, AlertProperty.class);
+    }
+
+    /**
+     * Gets known AlertProperty values.
+     *
+     * @return known AlertProperty values.
+     */
+    public static Collection<AlertProperty> values() {
+        return values(AlertProperty.class);
+    }
+}
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertPropertyMapping.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertPropertyMapping.java
new file mode 100644
index 000000000000..788c1080cb29
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertPropertyMapping.java
@@ -0,0 +1,76 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.models;
+
+import com.azure.core.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/** A single alert property mapping to override. */
+@Fluent
+public final class AlertPropertyMapping {
+    /*
+     * The V3 alert property
+     */
+    @JsonProperty(value = "alertProperty")
+    private AlertProperty alertProperty;
+
+    /*
+     * the column name to use to override this property
+     */
+    @JsonProperty(value = "value")
+    private String value;
+
+    /** Creates an instance of AlertPropertyMapping class. */
+    public AlertPropertyMapping() {
+    }
+
+    /**
+     * Get the alertProperty property: The V3 alert property.
+     *
+     * @return the alertProperty value.
+     */
+    public AlertProperty alertProperty() {
+        return this.alertProperty;
+    }
+
+    /**
+     * Set the alertProperty property: The V3 alert property.
+     *
+     * @param alertProperty the alertProperty value to set.
+     * @return the AlertPropertyMapping object itself.
+     */
+    public AlertPropertyMapping withAlertProperty(AlertProperty alertProperty) {
+        this.alertProperty = alertProperty;
+        return this;
+    }
+
+    /**
+     * Get the value property: the column name to use to override this property.
+     *
+     * @return the value value.
+     */
+    public String value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value property: the column name to use to override this property.
+     *
+     * @param value the value value to set.
+     * @return the AlertPropertyMapping object itself.
+     */
+    public AlertPropertyMapping withValue(String value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     *
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+}
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplateDataSource.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplateDataSource.java
index a8705467713b..483e3438ebf5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplateDataSource.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplateDataSource.java
@@ -23,6 +23,10 @@ public final class AlertRuleTemplateDataSource {
     @JsonProperty(value = "dataTypes")
     private List<String> dataTypes;
 
+    /** Creates an instance of AlertRuleTemplateDataSource class. */
+    public AlertRuleTemplateDataSource() {
+    }
+
     /**
      * Get the connectorId property: The connector id that provides the following data types.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplatePropertiesBase.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplatePropertiesBase.java
index 9ec04325df71..48d8d3074b68 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplatePropertiesBase.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplatePropertiesBase.java
@@ -54,6 +54,10 @@ public class AlertRuleTemplatePropertiesBase {
     @JsonProperty(value = "status")
     private TemplateStatus status;
 
+    /** Creates an instance of AlertRuleTemplatePropertiesBase class. */
+    public AlertRuleTemplatePropertiesBase() {
+    }
+
     /**
      * Get the alertRulesCreatedByTemplateCount property: the number of alert rules that were created by this template.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplateWithMitreProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplateWithMitreProperties.java
index 7ab1567de6d3..632078b48312 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplateWithMitreProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplateWithMitreProperties.java
@@ -23,6 +23,10 @@ public class AlertRuleTemplateWithMitreProperties extends AlertRuleTemplatePrope
     @JsonProperty(value = "techniques")
     private List<String> techniques;
 
+    /** Creates an instance of AlertRuleTemplateWithMitreProperties class. */
+    public AlertRuleTemplateWithMitreProperties() {
+    }
+
     /**
      * Get the tactics property: The tactics of the alert rule.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplates.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplates.java
index 6c1e23964aae..f1d562c1c487 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplates.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplates.java
@@ -41,12 +41,14 @@ public interface AlertRuleTemplates {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param alertRuleTemplateId Alert rule template ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the alert rule template.
+     * @return the alert rule template along with {@link Response}.
      */
-    AlertRuleTemplate get(String resourceGroupName, String workspaceName, String alertRuleTemplateId);
+    Response<AlertRuleTemplate> getWithResponse(
+        String resourceGroupName, String workspaceName, String alertRuleTemplateId, Context context);
 
     /**
      * Gets the alert rule template.
@@ -54,12 +56,10 @@ public interface AlertRuleTemplates {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param alertRuleTemplateId Alert rule template ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the alert rule template along with {@link Response}.
+     * @return the alert rule template.
      */
-    Response<AlertRuleTemplate> getWithResponse(
-        String resourceGroupName, String workspaceName, String alertRuleTemplateId, Context context);
+    AlertRuleTemplate get(String resourceGroupName, String workspaceName, String alertRuleTemplateId);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplatesList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplatesList.java
index 8292bf9e3852..b6aa4aa014af 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplatesList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRuleTemplatesList.java
@@ -25,6 +25,10 @@ public final class AlertRuleTemplatesList {
     @JsonProperty(value = "value", required = true)
     private List<AlertRuleTemplateInner> value;
 
+    /** Creates an instance of AlertRuleTemplatesList class. */
+    public AlertRuleTemplatesList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of alert rule templates.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRules.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRules.java
index 4ce770f0de66..22b64b10d08d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRules.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRules.java
@@ -42,12 +42,13 @@ public interface AlertRules {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the alert rule.
+     * @return the alert rule along with {@link Response}.
      */
-    AlertRule get(String resourceGroupName, String workspaceName, String ruleId);
+    Response<AlertRule> getWithResponse(String resourceGroupName, String workspaceName, String ruleId, Context context);
 
     /**
      * Gets the alert rule.
@@ -55,13 +56,12 @@ public interface AlertRules {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the alert rule along with {@link Response}.
+     * @return the alert rule.
      */
-    Response<AlertRule> getWithResponse(String resourceGroupName, String workspaceName, String ruleId, Context context);
+    AlertRule get(String resourceGroupName, String workspaceName, String ruleId);
 
     /**
      * Creates or updates the alert rule.
@@ -70,12 +70,14 @@ public interface AlertRules {
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
      * @param alertRule The alert rule.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return alert rule.
+     * @return alert rule along with {@link Response}.
      */
-    AlertRule createOrUpdate(String resourceGroupName, String workspaceName, String ruleId, AlertRuleInner alertRule);
+    Response<AlertRule> createOrUpdateWithResponse(
+        String resourceGroupName, String workspaceName, String ruleId, AlertRuleInner alertRule, Context context);
 
     /**
      * Creates or updates the alert rule.
@@ -84,14 +86,12 @@ public interface AlertRules {
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
      * @param alertRule The alert rule.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return alert rule along with {@link Response}.
+     * @return alert rule.
      */
-    Response<AlertRule> createOrUpdateWithResponse(
-        String resourceGroupName, String workspaceName, String ruleId, AlertRuleInner alertRule, Context context);
+    AlertRule createOrUpdate(String resourceGroupName, String workspaceName, String ruleId, AlertRuleInner alertRule);
 
     /**
      * Delete the alert rule.
@@ -99,11 +99,13 @@ Response<AlertRule> createOrUpdateWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
-    void delete(String resourceGroupName, String workspaceName, String ruleId);
+    Response<Void> deleteWithResponse(String resourceGroupName, String workspaceName, String ruleId, Context context);
 
     /**
      * Delete the alert rule.
@@ -111,11 +113,9 @@ Response<AlertRule> createOrUpdateWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param ruleId Alert rule ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
-    Response<Void> deleteWithResponse(String resourceGroupName, String workspaceName, String ruleId, Context context);
+    void delete(String resourceGroupName, String workspaceName, String ruleId);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRulesList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRulesList.java
index c758bd659a27..886714757288 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRulesList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertRulesList.java
@@ -25,6 +25,10 @@ public final class AlertRulesList {
     @JsonProperty(value = "value", required = true)
     private List<AlertRuleInner> value;
 
+    /** Creates an instance of AlertRulesList class. */
+    public AlertRulesList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of alert rules.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertsDataTypeOfDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertsDataTypeOfDataConnector.java
index 2b9ea1a54378..55703ca25bb5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertsDataTypeOfDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AlertsDataTypeOfDataConnector.java
@@ -17,6 +17,10 @@ public class AlertsDataTypeOfDataConnector {
     @JsonProperty(value = "alerts", required = true)
     private DataConnectorDataTypeCommon alerts;
 
+    /** Creates an instance of AlertsDataTypeOfDataConnector class. */
+    public AlertsDataTypeOfDataConnector() {
+    }
+
     /**
      * Get the alerts property: Alerts data type connection.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Anomalies.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Anomalies.java
index a06d6aea9018..226c2ae74340 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Anomalies.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Anomalies.java
@@ -22,6 +22,10 @@ public final class Anomalies extends SettingsInner {
     @JsonProperty(value = "properties")
     private AnomaliesSettingsProperties innerProperties;
 
+    /** Creates an instance of Anomalies class. */
+    public Anomalies() {
+    }
+
     /**
      * Get the innerProperties property: Anomalies properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AnomalySecurityMLAnalyticsSettings.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AnomalySecurityMLAnalyticsSettings.java
index 3a67f21d0c14..73454b1a181d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AnomalySecurityMLAnalyticsSettings.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AnomalySecurityMLAnalyticsSettings.java
@@ -26,6 +26,10 @@ public final class AnomalySecurityMLAnalyticsSettings extends SecurityMLAnalytic
     @JsonProperty(value = "properties")
     private AnomalySecurityMLAnalyticsSettingsProperties innerProperties;
 
+    /** Creates an instance of AnomalySecurityMLAnalyticsSettings class. */
+    public AnomalySecurityMLAnalyticsSettings() {
+    }
+
     /**
      * Get the innerProperties property: Anomaly Security ML Analytics Settings properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AnomalyTimelineItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AnomalyTimelineItem.java
index 28ec81da3af0..770c6cef09f9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AnomalyTimelineItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AnomalyTimelineItem.java
@@ -83,6 +83,10 @@ public final class AnomalyTimelineItem extends EntityTimelineItem {
     @JsonProperty(value = "reasons")
     private List<String> reasons;
 
+    /** Creates an instance of AnomalyTimelineItem class. */
+    public AnomalyTimelineItem() {
+    }
+
     /**
      * Get the azureResourceId property: The anomaly azure resource id.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AscCheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AscCheckRequirements.java
index 836a4a6fdd8f..9f04682b1913 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AscCheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AscCheckRequirements.java
@@ -21,6 +21,10 @@ public final class AscCheckRequirements extends DataConnectorsCheckRequirements
     @JsonProperty(value = "properties")
     private AscCheckRequirementsProperties innerProperties;
 
+    /** Creates an instance of AscCheckRequirements class. */
+    public AscCheckRequirements() {
+    }
+
     /**
      * Get the innerProperties property: ASC (Azure Security Center) requirements check properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AscDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AscDataConnector.java
index 683d6beac5b1..ad42050543f5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AscDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AscDataConnector.java
@@ -22,6 +22,10 @@ public final class AscDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private AscDataConnectorProperties innerProperties;
 
+    /** Creates an instance of AscDataConnector class. */
+    public AscDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: ASC (Azure Security Center) data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleAction.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleAction.java
index 3ff1bf1a59fe..c95dd2247b4b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleAction.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleAction.java
@@ -29,6 +29,10 @@ public class AutomationRuleAction {
     @JsonProperty(value = "order", required = true)
     private int order;
 
+    /** Creates an instance of AutomationRuleAction class. */
+    public AutomationRuleAction() {
+    }
+
     /**
      * Get the order property: The order property.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleBooleanCondition.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleBooleanCondition.java
index 0eee30498e7c..fb6b532aa049 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleBooleanCondition.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleBooleanCondition.java
@@ -23,6 +23,10 @@ public final class AutomationRuleBooleanCondition {
     @JsonProperty(value = "innerConditions")
     private List<AutomationRuleCondition> innerConditions;
 
+    /** Creates an instance of AutomationRuleBooleanCondition class. */
+    public AutomationRuleBooleanCondition() {
+    }
+
     /**
      * Get the operator property: The operator property.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleCondition.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleCondition.java
index fbd2b4bcaef2..d735c7a02b80 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleCondition.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleCondition.java
@@ -25,6 +25,10 @@
 })
 @Immutable
 public class AutomationRuleCondition {
+    /** Creates an instance of AutomationRuleCondition class. */
+    public AutomationRuleCondition() {
+    }
+
     /**
      * Validates the instance.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleModifyPropertiesAction.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleModifyPropertiesAction.java
index 0f56b3772f36..7671608ffc48 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleModifyPropertiesAction.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleModifyPropertiesAction.java
@@ -20,6 +20,10 @@ public final class AutomationRuleModifyPropertiesAction extends AutomationRuleAc
     @JsonProperty(value = "actionConfiguration")
     private IncidentPropertiesAction actionConfiguration;
 
+    /** Creates an instance of AutomationRuleModifyPropertiesAction class. */
+    public AutomationRuleModifyPropertiesAction() {
+    }
+
     /**
      * Get the actionConfiguration property: The actionConfiguration property.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulePropertyArrayChangedValuesCondition.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulePropertyArrayChangedValuesCondition.java
index 33ee0d2d5aee..36b6f40f659b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulePropertyArrayChangedValuesCondition.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulePropertyArrayChangedValuesCondition.java
@@ -22,6 +22,10 @@ public final class AutomationRulePropertyArrayChangedValuesCondition {
     @JsonProperty(value = "changeType")
     private AutomationRulePropertyArrayChangedConditionSupportedChangeType changeType;
 
+    /** Creates an instance of AutomationRulePropertyArrayChangedValuesCondition class. */
+    public AutomationRulePropertyArrayChangedValuesCondition() {
+    }
+
     /**
      * Get the arrayType property: The arrayType property.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulePropertyArrayValuesCondition.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulePropertyArrayValuesCondition.java
index 40158ab460bc..381ce9aa7de3 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulePropertyArrayValuesCondition.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulePropertyArrayValuesCondition.java
@@ -29,6 +29,10 @@ public final class AutomationRulePropertyArrayValuesCondition {
     @JsonProperty(value = "itemConditions")
     private List<AutomationRuleCondition> itemConditions;
 
+    /** Creates an instance of AutomationRulePropertyArrayValuesCondition class. */
+    public AutomationRulePropertyArrayValuesCondition() {
+    }
+
     /**
      * Get the arrayType property: The arrayType property.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulePropertyValuesChangedCondition.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulePropertyValuesChangedCondition.java
index 9996382f4bdd..ff5cf10eefd4 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulePropertyValuesChangedCondition.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulePropertyValuesChangedCondition.java
@@ -35,6 +35,10 @@ public final class AutomationRulePropertyValuesChangedCondition {
     @JsonProperty(value = "propertyValues")
     private List<String> propertyValues;
 
+    /** Creates an instance of AutomationRulePropertyValuesChangedCondition class. */
+    public AutomationRulePropertyValuesChangedCondition() {
+    }
+
     /**
      * Get the propertyName property: The propertyName property.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulePropertyValuesCondition.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulePropertyValuesCondition.java
index d04dd33f2854..c6401d78b6c7 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulePropertyValuesCondition.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulePropertyValuesCondition.java
@@ -29,6 +29,10 @@ public final class AutomationRulePropertyValuesCondition {
     @JsonProperty(value = "propertyValues")
     private List<String> propertyValues;
 
+    /** Creates an instance of AutomationRulePropertyValuesCondition class. */
+    public AutomationRulePropertyValuesCondition() {
+    }
+
     /**
      * Get the propertyName property: The property to evaluate in an automation rule property condition.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleRunPlaybookAction.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleRunPlaybookAction.java
index f2b367315f61..a8f694f9859c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleRunPlaybookAction.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleRunPlaybookAction.java
@@ -20,6 +20,10 @@ public final class AutomationRuleRunPlaybookAction extends AutomationRuleAction
     @JsonProperty(value = "actionConfiguration")
     private PlaybookActionProperties actionConfiguration;
 
+    /** Creates an instance of AutomationRuleRunPlaybookAction class. */
+    public AutomationRuleRunPlaybookAction() {
+    }
+
     /**
      * Get the actionConfiguration property: The actionConfiguration property.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleTriggeringLogic.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleTriggeringLogic.java
index 066a10e1830e..a2bd9c35c459 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleTriggeringLogic.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRuleTriggeringLogic.java
@@ -43,6 +43,10 @@ public final class AutomationRuleTriggeringLogic {
     @JsonProperty(value = "conditions")
     private List<AutomationRuleCondition> conditions;
 
+    /** Creates an instance of AutomationRuleTriggeringLogic class. */
+    public AutomationRuleTriggeringLogic() {
+    }
+
     /**
      * Get the isEnabled property: Determines whether the automation rule is enabled or disabled.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRules.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRules.java
index 157bf09eeafd..5a3125430eb8 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRules.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRules.java
@@ -16,12 +16,14 @@ public interface AutomationRules {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param automationRuleId Automation rule ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the automation rule.
+     * @return the automation rule along with {@link Response}.
      */
-    AutomationRule get(String resourceGroupName, String workspaceName, String automationRuleId);
+    Response<AutomationRule> getWithResponse(
+        String resourceGroupName, String workspaceName, String automationRuleId, Context context);
 
     /**
      * Gets the automation rule.
@@ -29,14 +31,12 @@ public interface AutomationRules {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param automationRuleId Automation rule ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the automation rule along with {@link Response}.
+     * @return the automation rule.
      */
-    Response<AutomationRule> getWithResponse(
-        String resourceGroupName, String workspaceName, String automationRuleId, Context context);
+    AutomationRule get(String resourceGroupName, String workspaceName, String automationRuleId);
 
     /**
      * Delete the automation rule.
@@ -44,12 +44,14 @@ Response<AutomationRule> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param automationRuleId Automation rule ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return any object.
+     * @return any object along with {@link Response}.
      */
-    Object delete(String resourceGroupName, String workspaceName, String automationRuleId);
+    Response<Object> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String automationRuleId, Context context);
 
     /**
      * Delete the automation rule.
@@ -57,14 +59,12 @@ Response<AutomationRule> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param automationRuleId Automation rule ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return any object along with {@link Response}.
+     * @return any object.
      */
-    Response<Object> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String automationRuleId, Context context);
+    Object delete(String resourceGroupName, String workspaceName, String automationRuleId);
 
     /**
      * Gets all automation rules.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulesList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulesList.java
index ca0dc3474b77..272b819532b7 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulesList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AutomationRulesList.java
@@ -24,6 +24,10 @@ public final class AutomationRulesList {
     @JsonProperty(value = "nextLink")
     private String nextLink;
 
+    /** Creates an instance of AutomationRulesList class. */
+    public AutomationRulesList() {
+    }
+
     /**
      * Get the value property: The value property.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Availability.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Availability.java
index 30665983543b..c7333878de2f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Availability.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Availability.java
@@ -22,6 +22,10 @@ public final class Availability {
     @JsonProperty(value = "isPreview")
     private Boolean isPreview;
 
+    /** Creates an instance of Availability class. */
+    public Availability() {
+    }
+
     /**
      * Get the status property: The connector Availability Status.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsCloudTrailCheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsCloudTrailCheckRequirements.java
index 047f80cbc5a1..4f5cf47b4120 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsCloudTrailCheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsCloudTrailCheckRequirements.java
@@ -13,6 +13,10 @@
 @JsonTypeName("AmazonWebServicesCloudTrail")
 @Immutable
 public final class AwsCloudTrailCheckRequirements extends DataConnectorsCheckRequirements {
+    /** Creates an instance of AwsCloudTrailCheckRequirements class. */
+    public AwsCloudTrailCheckRequirements() {
+    }
+
     /**
      * Validates the instance.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsCloudTrailDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsCloudTrailDataConnector.java
index 85fed62b4c13..bd6fabfc5678 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsCloudTrailDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsCloudTrailDataConnector.java
@@ -22,6 +22,10 @@ public final class AwsCloudTrailDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private AwsCloudTrailDataConnectorProperties innerProperties;
 
+    /** Creates an instance of AwsCloudTrailDataConnector class. */
+    public AwsCloudTrailDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: Amazon Web Services CloudTrail data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsCloudTrailDataConnectorDataTypes.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsCloudTrailDataConnectorDataTypes.java
index 019e54161be6..0d072da4e805 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsCloudTrailDataConnectorDataTypes.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsCloudTrailDataConnectorDataTypes.java
@@ -17,6 +17,10 @@ public final class AwsCloudTrailDataConnectorDataTypes {
     @JsonProperty(value = "logs", required = true)
     private AwsCloudTrailDataConnectorDataTypesLogs logs;
 
+    /** Creates an instance of AwsCloudTrailDataConnectorDataTypes class. */
+    public AwsCloudTrailDataConnectorDataTypes() {
+    }
+
     /**
      * Get the logs property: Logs data type.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsCloudTrailDataConnectorDataTypesLogs.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsCloudTrailDataConnectorDataTypesLogs.java
index f11d9c72a1d9..bb73c9450fe5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsCloudTrailDataConnectorDataTypesLogs.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsCloudTrailDataConnectorDataTypesLogs.java
@@ -9,6 +9,10 @@
 /** Logs data type. */
 @Fluent
 public final class AwsCloudTrailDataConnectorDataTypesLogs extends DataConnectorDataTypeCommon {
+    /** Creates an instance of AwsCloudTrailDataConnectorDataTypesLogs class. */
+    public AwsCloudTrailDataConnectorDataTypesLogs() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public AwsCloudTrailDataConnectorDataTypesLogs withState(DataTypeState state) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsS3CheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsS3CheckRequirements.java
index ddfb6f7d40c1..753b432fb039 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsS3CheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsS3CheckRequirements.java
@@ -13,6 +13,10 @@
 @JsonTypeName("AmazonWebServicesS3")
 @Immutable
 public final class AwsS3CheckRequirements extends DataConnectorsCheckRequirements {
+    /** Creates an instance of AwsS3CheckRequirements class. */
+    public AwsS3CheckRequirements() {
+    }
+
     /**
      * Validates the instance.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsS3DataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsS3DataConnector.java
index 3739b6ccb523..65fcba2368f6 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsS3DataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsS3DataConnector.java
@@ -23,6 +23,10 @@ public final class AwsS3DataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private AwsS3DataConnectorProperties innerProperties;
 
+    /** Creates an instance of AwsS3DataConnector class. */
+    public AwsS3DataConnector() {
+    }
+
     /**
      * Get the innerProperties property: Amazon Web Services S3 data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsS3DataConnectorDataTypes.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsS3DataConnectorDataTypes.java
index 14c7a6754785..18cc9658d41b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsS3DataConnectorDataTypes.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsS3DataConnectorDataTypes.java
@@ -17,6 +17,10 @@ public final class AwsS3DataConnectorDataTypes {
     @JsonProperty(value = "logs", required = true)
     private AwsS3DataConnectorDataTypesLogs logs;
 
+    /** Creates an instance of AwsS3DataConnectorDataTypes class. */
+    public AwsS3DataConnectorDataTypes() {
+    }
+
     /**
      * Get the logs property: Logs data type.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsS3DataConnectorDataTypesLogs.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsS3DataConnectorDataTypesLogs.java
index dd24d8ad6de3..855fe6d5d57f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsS3DataConnectorDataTypesLogs.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AwsS3DataConnectorDataTypesLogs.java
@@ -9,6 +9,10 @@
 /** Logs data type. */
 @Fluent
 public final class AwsS3DataConnectorDataTypesLogs extends DataConnectorDataTypeCommon {
+    /** Creates an instance of AwsS3DataConnectorDataTypesLogs class. */
+    public AwsS3DataConnectorDataTypesLogs() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public AwsS3DataConnectorDataTypesLogs withState(DataTypeState state) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AzureDevOpsResourceInfo.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AzureDevOpsResourceInfo.java
index 4c8ea0212461..c2929f76aa26 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AzureDevOpsResourceInfo.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AzureDevOpsResourceInfo.java
@@ -22,6 +22,10 @@ public final class AzureDevOpsResourceInfo {
     @JsonProperty(value = "serviceConnectionId")
     private String serviceConnectionId;
 
+    /** Creates an instance of AzureDevOpsResourceInfo class. */
+    public AzureDevOpsResourceInfo() {
+    }
+
     /**
      * Get the pipelineId property: Id of the pipeline created for the source-control.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AzureEntityResource.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AzureEntityResource.java
new file mode 100644
index 000000000000..f46f6971d29f
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AzureEntityResource.java
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.core.management.ProxyResource;
+import com.azure.core.management.SystemData;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Entity Resource
+ *
+ * <p>The resource model definition for an Azure Resource Manager resource with an etag.
+ */
+@Immutable
+public class AzureEntityResource extends ProxyResource {
+    /*
+     * Resource Etag.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /*
+     * Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     */
+    @JsonProperty(value = "systemData", access = JsonProperty.Access.WRITE_ONLY)
+    private SystemData systemData;
+
+    /** Creates an instance of AzureEntityResource class. */
+    public AzureEntityResource() {
+    }
+
+    /**
+     * Get the etag property: Resource Etag.
+     *
+     * @return the etag value.
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     *
+     * @return the systemData value.
+     */
+    public SystemData systemData() {
+        return this.systemData;
+    }
+
+    /**
+     * Validates the instance.
+     *
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+}
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AzureResourceEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AzureResourceEntity.java
index 64b4871d5cf4..178ea6f4edd3 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AzureResourceEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/AzureResourceEntity.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.AzureResourceEntityProperties;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityInner;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -15,7 +15,7 @@
 /** Represents an azure resource entity. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("AzureResource")
-@Fluent
+@Immutable
 public final class AzureResourceEntity extends EntityInner {
     /*
      * AzureResource entity properties
@@ -23,6 +23,10 @@ public final class AzureResourceEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private AzureResourceEntityProperties innerProperties;
 
+    /** Creates an instance of AzureResourceEntity class. */
+    public AzureResourceEntity() {
+    }
+
     /**
      * Get the innerProperties property: AzureResource entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkEntityMappings.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkEntityMappings.java
index b46a2d88c95d..69d5f83fc4e2 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkEntityMappings.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkEntityMappings.java
@@ -23,6 +23,10 @@ public final class BookmarkEntityMappings {
     @JsonProperty(value = "fieldMappings")
     private List<EntityFieldMapping> fieldMappings;
 
+    /** Creates an instance of BookmarkEntityMappings class. */
+    public BookmarkEntityMappings() {
+    }
+
     /**
      * Get the entityType property: The entity type.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkExpandParameters.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkExpandParameters.java
index ea70e0521448..c20dfc59bd11 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkExpandParameters.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkExpandParameters.java
@@ -30,6 +30,10 @@ public final class BookmarkExpandParameters {
     @JsonProperty(value = "startTime")
     private OffsetDateTime startTime;
 
+    /** Creates an instance of BookmarkExpandParameters class. */
+    public BookmarkExpandParameters() {
+    }
+
     /**
      * Get the endTime property: The end date filter, so the only expansion results returned are before this date.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkExpandResponseValue.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkExpandResponseValue.java
index b9b48339a131..d0dd0a8b9295 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkExpandResponseValue.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkExpandResponseValue.java
@@ -24,6 +24,10 @@ public final class BookmarkExpandResponseValue {
     @JsonProperty(value = "edges")
     private List<ConnectedEntity> edges;
 
+    /** Creates an instance of BookmarkExpandResponseValue class. */
+    public BookmarkExpandResponseValue() {
+    }
+
     /**
      * Get the entities property: Array of the expansion result entities.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkList.java
index f89890b19242..b718b92eea2f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkList.java
@@ -25,6 +25,10 @@ public final class BookmarkList {
     @JsonProperty(value = "value", required = true)
     private List<BookmarkInner> value;
 
+    /** Creates an instance of BookmarkList class. */
+    public BookmarkList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of bookmarks.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkOperations.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkOperations.java
index cf54322f2c78..510c32bc2a79 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkOperations.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkOperations.java
@@ -16,13 +16,18 @@ public interface BookmarkOperations {
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param parameters The parameters required to execute an expand operation on the given bookmark.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the entity expansion result operation response.
+     * @return the entity expansion result operation response along with {@link Response}.
      */
-    BookmarkExpandResponse expand(
-        String resourceGroupName, String workspaceName, String bookmarkId, BookmarkExpandParameters parameters);
+    Response<BookmarkExpandResponse> expandWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String bookmarkId,
+        BookmarkExpandParameters parameters,
+        Context context);
 
     /**
      * Expand an bookmark.
@@ -31,16 +36,11 @@ BookmarkExpandResponse expand(
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param parameters The parameters required to execute an expand operation on the given bookmark.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the entity expansion result operation response along with {@link Response}.
+     * @return the entity expansion result operation response.
      */
-    Response<BookmarkExpandResponse> expandWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String bookmarkId,
-        BookmarkExpandParameters parameters,
-        Context context);
+    BookmarkExpandResponse expand(
+        String resourceGroupName, String workspaceName, String bookmarkId, BookmarkExpandParameters parameters);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkRelations.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkRelations.java
index e1db491640d0..e146bc88ea21 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkRelations.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkRelations.java
@@ -58,12 +58,14 @@ PagedIterable<Relation> list(
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param relationName Relation Name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a bookmark relation.
+     * @return a bookmark relation along with {@link Response}.
      */
-    Relation get(String resourceGroupName, String workspaceName, String bookmarkId, String relationName);
+    Response<Relation> getWithResponse(
+        String resourceGroupName, String workspaceName, String bookmarkId, String relationName, Context context);
 
     /**
      * Gets a bookmark relation.
@@ -72,14 +74,12 @@ PagedIterable<Relation> list(
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param relationName Relation Name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a bookmark relation along with {@link Response}.
+     * @return a bookmark relation.
      */
-    Response<Relation> getWithResponse(
-        String resourceGroupName, String workspaceName, String bookmarkId, String relationName, Context context);
+    Relation get(String resourceGroupName, String workspaceName, String bookmarkId, String relationName);
 
     /**
      * Delete the bookmark relation.
@@ -88,11 +88,14 @@ Response<Relation> getWithResponse(
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param relationName Relation Name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
-    void delete(String resourceGroupName, String workspaceName, String bookmarkId, String relationName);
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String bookmarkId, String relationName, Context context);
 
     /**
      * Delete the bookmark relation.
@@ -101,14 +104,11 @@ Response<Relation> getWithResponse(
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
      * @param relationName Relation Name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
-    Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String bookmarkId, String relationName, Context context);
+    void delete(String resourceGroupName, String workspaceName, String bookmarkId, String relationName);
 
     /**
      * Gets a bookmark relation.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkTimelineItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkTimelineItem.java
index bfad411f1ce6..37689f545cfe 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkTimelineItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BookmarkTimelineItem.java
@@ -65,6 +65,10 @@ public final class BookmarkTimelineItem extends EntityTimelineItem {
     @JsonProperty(value = "labels")
     private List<String> labels;
 
+    /** Creates an instance of BookmarkTimelineItem class. */
+    public BookmarkTimelineItem() {
+    }
+
     /**
      * Get the azureResourceId property: The bookmark azure resource id.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Bookmarks.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Bookmarks.java
index 3b3706f36fd8..844d404d4847 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Bookmarks.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Bookmarks.java
@@ -41,12 +41,14 @@ public interface Bookmarks {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a bookmark.
+     * @return a bookmark along with {@link Response}.
      */
-    Bookmark get(String resourceGroupName, String workspaceName, String bookmarkId);
+    Response<Bookmark> getWithResponse(
+        String resourceGroupName, String workspaceName, String bookmarkId, Context context);
 
     /**
      * Gets a bookmark.
@@ -54,14 +56,12 @@ public interface Bookmarks {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a bookmark along with {@link Response}.
+     * @return a bookmark.
      */
-    Response<Bookmark> getWithResponse(
-        String resourceGroupName, String workspaceName, String bookmarkId, Context context);
+    Bookmark get(String resourceGroupName, String workspaceName, String bookmarkId);
 
     /**
      * Delete the bookmark.
@@ -69,11 +69,14 @@ Response<Bookmark> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
-    void delete(String resourceGroupName, String workspaceName, String bookmarkId);
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String bookmarkId, Context context);
 
     /**
      * Delete the bookmark.
@@ -81,14 +84,11 @@ Response<Bookmark> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param bookmarkId Bookmark ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
-    Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String bookmarkId, Context context);
+    void delete(String resourceGroupName, String workspaceName, String bookmarkId);
 
     /**
      * Gets a bookmark.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BooleanConditionProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BooleanConditionProperties.java
index be26717140de..563c06bf65e0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BooleanConditionProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/BooleanConditionProperties.java
@@ -20,6 +20,10 @@ public final class BooleanConditionProperties extends AutomationRuleCondition {
     @JsonProperty(value = "conditionProperties")
     private AutomationRuleBooleanCondition conditionProperties;
 
+    /** Creates an instance of BooleanConditionProperties class. */
+    public BooleanConditionProperties() {
+    }
+
     /**
      * Get the conditionProperties property: The conditionProperties property.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ClientInfo.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ClientInfo.java
index 9d6d5e61b586..df99e16b4d4a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ClientInfo.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ClientInfo.java
@@ -35,6 +35,10 @@ public final class ClientInfo {
     @JsonProperty(value = "userPrincipalName")
     private String userPrincipalName;
 
+    /** Creates an instance of ClientInfo class. */
+    public ClientInfo() {
+    }
+
     /**
      * Get the email property: The email of the client.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CloudApplicationEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CloudApplicationEntity.java
index 2d0908e927da..ed15f6bcb516 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CloudApplicationEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CloudApplicationEntity.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.CloudApplicationEntityProperties;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityInner;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -15,7 +15,7 @@
 /** Represents a cloud application entity. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("CloudApplication")
-@Fluent
+@Immutable
 public final class CloudApplicationEntity extends EntityInner {
     /*
      * CloudApplication entity properties
@@ -23,6 +23,10 @@ public final class CloudApplicationEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private CloudApplicationEntityProperties innerProperties;
 
+    /** Creates an instance of CloudApplicationEntity class. */
+    public CloudApplicationEntity() {
+    }
+
     /**
      * Get the innerProperties property: CloudApplication entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessApiPollingDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessApiPollingDataConnector.java
index 396d69282da3..5e61a7e1755c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessApiPollingDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessApiPollingDataConnector.java
@@ -22,6 +22,10 @@ public final class CodelessApiPollingDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private ApiPollingParameters innerProperties;
 
+    /** Creates an instance of CodelessApiPollingDataConnector class. */
+    public CodelessApiPollingDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: Codeless poling data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingAuthProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingAuthProperties.java
index a9a781b14c94..5e07b5b9c84d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingAuthProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingAuthProperties.java
@@ -89,6 +89,10 @@ public final class CodelessConnectorPollingAuthProperties {
     @JsonProperty(value = "scope")
     private String scope;
 
+    /** Creates an instance of CodelessConnectorPollingAuthProperties class. */
+    public CodelessConnectorPollingAuthProperties() {
+    }
+
     /**
      * Get the authType property: The authentication type.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingConfigProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingConfigProperties.java
index b1040c30de77..1c855a507074 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingConfigProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingConfigProperties.java
@@ -41,6 +41,10 @@ public final class CodelessConnectorPollingConfigProperties {
     @JsonProperty(value = "response")
     private CodelessConnectorPollingResponseProperties response;
 
+    /** Creates an instance of CodelessConnectorPollingConfigProperties class. */
+    public CodelessConnectorPollingConfigProperties() {
+    }
+
     /**
      * Get the isActive property: The poller active status.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingPagingProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingPagingProperties.java
index a0d01a5af717..ae569a83de31 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingPagingProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingPagingProperties.java
@@ -65,6 +65,10 @@ public final class CodelessConnectorPollingPagingProperties {
     @JsonProperty(value = "pageSize")
     private Integer pageSize;
 
+    /** Creates an instance of CodelessConnectorPollingPagingProperties class. */
+    public CodelessConnectorPollingPagingProperties() {
+    }
+
     /**
      * Get the pagingType property: Describes the type. could be 'None', 'PageToken', 'PageCount', 'TimeStamp'.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingRequestProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingRequestProperties.java
index cf4d6e8754b9..268b7ae71840 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingRequestProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingRequestProperties.java
@@ -83,6 +83,10 @@ public final class CodelessConnectorPollingRequestProperties {
     @JsonProperty(value = "endTimeAttributeName")
     private String endTimeAttributeName;
 
+    /** Creates an instance of CodelessConnectorPollingRequestProperties class. */
+    public CodelessConnectorPollingRequestProperties() {
+    }
+
     /**
      * Get the apiEndpoint property: Describe the endpoint we should pull the data from.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingResponseProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingResponseProperties.java
index 561f409ee82f..6418f41211f7 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingResponseProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessConnectorPollingResponseProperties.java
@@ -36,6 +36,10 @@ public final class CodelessConnectorPollingResponseProperties {
     @JsonProperty(value = "isGzipCompressed")
     private Boolean isGzipCompressed;
 
+    /** Creates an instance of CodelessConnectorPollingResponseProperties class. */
+    public CodelessConnectorPollingResponseProperties() {
+    }
+
     /**
      * Get the eventsJsonPaths property: Describes the path we should extract the data in the response.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigProperties.java
index bf0ae2f7d8b4..41d52e49929f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigProperties.java
@@ -84,6 +84,10 @@ public final class CodelessUiConnectorConfigProperties {
     @JsonProperty(value = "instructionSteps", required = true)
     private List<CodelessUiConnectorConfigPropertiesInstructionStepsItem> instructionSteps;
 
+    /** Creates an instance of CodelessUiConnectorConfigProperties class. */
+    public CodelessUiConnectorConfigProperties() {
+    }
+
     /**
      * Get the title property: Connector blade title.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesConnectivityCriteriaItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesConnectivityCriteriaItem.java
index c57fe3ddde43..324c9a5fdd6c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesConnectivityCriteriaItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesConnectivityCriteriaItem.java
@@ -10,6 +10,10 @@
 /** The CodelessUiConnectorConfigPropertiesConnectivityCriteriaItem model. */
 @Fluent
 public final class CodelessUiConnectorConfigPropertiesConnectivityCriteriaItem extends ConnectivityCriteria {
+    /** Creates an instance of CodelessUiConnectorConfigPropertiesConnectivityCriteriaItem class. */
+    public CodelessUiConnectorConfigPropertiesConnectivityCriteriaItem() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public CodelessUiConnectorConfigPropertiesConnectivityCriteriaItem withType(ConnectivityType type) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesDataTypesItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesDataTypesItem.java
index 1f9a8f78eb43..bc9304fa137a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesDataTypesItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesDataTypesItem.java
@@ -9,6 +9,10 @@
 /** The CodelessUiConnectorConfigPropertiesDataTypesItem model. */
 @Fluent
 public final class CodelessUiConnectorConfigPropertiesDataTypesItem extends LastDataReceivedDataType {
+    /** Creates an instance of CodelessUiConnectorConfigPropertiesDataTypesItem class. */
+    public CodelessUiConnectorConfigPropertiesDataTypesItem() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public CodelessUiConnectorConfigPropertiesDataTypesItem withName(String name) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesGraphQueriesItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesGraphQueriesItem.java
index 80ff447db0ad..251488f8d624 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesGraphQueriesItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesGraphQueriesItem.java
@@ -9,6 +9,10 @@
 /** The CodelessUiConnectorConfigPropertiesGraphQueriesItem model. */
 @Fluent
 public final class CodelessUiConnectorConfigPropertiesGraphQueriesItem extends GraphQueries {
+    /** Creates an instance of CodelessUiConnectorConfigPropertiesGraphQueriesItem class. */
+    public CodelessUiConnectorConfigPropertiesGraphQueriesItem() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public CodelessUiConnectorConfigPropertiesGraphQueriesItem withMetricName(String metricName) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesInstructionStepsItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesInstructionStepsItem.java
index 187727984833..3116316916d2 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesInstructionStepsItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesInstructionStepsItem.java
@@ -10,6 +10,10 @@
 /** The CodelessUiConnectorConfigPropertiesInstructionStepsItem model. */
 @Fluent
 public final class CodelessUiConnectorConfigPropertiesInstructionStepsItem extends InstructionSteps {
+    /** Creates an instance of CodelessUiConnectorConfigPropertiesInstructionStepsItem class. */
+    public CodelessUiConnectorConfigPropertiesInstructionStepsItem() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public CodelessUiConnectorConfigPropertiesInstructionStepsItem withTitle(String title) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesSampleQueriesItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesSampleQueriesItem.java
index 288bd8d550f8..da94f59b943d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesSampleQueriesItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiConnectorConfigPropertiesSampleQueriesItem.java
@@ -9,6 +9,10 @@
 /** The CodelessUiConnectorConfigPropertiesSampleQueriesItem model. */
 @Fluent
 public final class CodelessUiConnectorConfigPropertiesSampleQueriesItem extends SampleQueries {
+    /** Creates an instance of CodelessUiConnectorConfigPropertiesSampleQueriesItem class. */
+    public CodelessUiConnectorConfigPropertiesSampleQueriesItem() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public CodelessUiConnectorConfigPropertiesSampleQueriesItem withDescription(String description) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiDataConnector.java
index 06cd156687bb..cbf0702a8708 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CodelessUiDataConnector.java
@@ -22,6 +22,10 @@ public final class CodelessUiDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private CodelessParameters innerProperties;
 
+    /** Creates an instance of CodelessUiDataConnector class. */
+    public CodelessUiDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: Codeless UI data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ConnectedEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ConnectedEntity.java
index 655facb3559a..be350399547f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ConnectedEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ConnectedEntity.java
@@ -22,6 +22,10 @@ public final class ConnectedEntity {
     @JsonProperty(value = "additionalData")
     private Object additionalData;
 
+    /** Creates an instance of ConnectedEntity class. */
+    public ConnectedEntity() {
+    }
+
     /**
      * Get the targetEntityId property: Entity Id of the connected entity.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ConnectivityCriteria.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ConnectivityCriteria.java
index da5f0724d422..32ad5919b97b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ConnectivityCriteria.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ConnectivityCriteria.java
@@ -23,6 +23,10 @@ public class ConnectivityCriteria {
     @JsonProperty(value = "value")
     private List<String> value;
 
+    /** Creates an instance of ConnectivityCriteria class. */
+    public ConnectivityCriteria() {
+    }
+
     /**
      * Get the type property: type of connectivity.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ConnectorInstructionModelBase.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ConnectorInstructionModelBase.java
index c710b1b251e2..fd391a3d9a90 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ConnectorInstructionModelBase.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ConnectorInstructionModelBase.java
@@ -23,6 +23,10 @@ public class ConnectorInstructionModelBase {
     @JsonProperty(value = "type", required = true)
     private SettingType type;
 
+    /** Creates an instance of ConnectorInstructionModelBase class. */
+    public ConnectorInstructionModelBase() {
+    }
+
     /**
      * Get the parameters property: The parameters for the setting.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Constant88.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Constant90.java
similarity index 67%
rename from sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Constant88.java
rename to sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Constant90.java
index 32293661fa1d..9f69c9199d0a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Constant88.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Constant90.java
@@ -7,31 +7,31 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-/** Defines values for Constant88. */
-public enum Constant88 {
+/** Defines values for Constant90. */
+public enum Constant90 {
     /** Enum value Activity. */
     ACTIVITY("Activity");
 
-    /** The actual serialized value for a Constant88 instance. */
+    /** The actual serialized value for a Constant90 instance. */
     private final String value;
 
-    Constant88(String value) {
+    Constant90(String value) {
         this.value = value;
     }
 
     /**
-     * Parses a serialized value to a Constant88 instance.
+     * Parses a serialized value to a Constant90 instance.
      *
      * @param value the serialized value to parse.
-     * @return the parsed Constant88 object, or null if unable to parse.
+     * @return the parsed Constant90 object, or null if unable to parse.
      */
     @JsonCreator
-    public static Constant88 fromString(String value) {
+    public static Constant90 fromString(String value) {
         if (value == null) {
             return null;
         }
-        Constant88[] items = Constant88.values();
-        for (Constant88 item : items) {
+        Constant90[] items = Constant90.values();
+        for (Constant90 item : items) {
             if (item.toString().equalsIgnoreCase(value)) {
                 return item;
             }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ContentPathMap.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ContentPathMap.java
index 55e4aa0cd259..1a3480664e08 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ContentPathMap.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ContentPathMap.java
@@ -22,6 +22,10 @@ public final class ContentPathMap {
     @JsonProperty(value = "path")
     private String path;
 
+    /** Creates an instance of ContentPathMap class. */
+    public ContentPathMap() {
+    }
+
     /**
      * Get the contentType property: Content type.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CustomEntityQuery.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CustomEntityQuery.java
index 76169a7542b0..8a71f8d00b29 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CustomEntityQuery.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CustomEntityQuery.java
@@ -19,6 +19,10 @@
 @JsonSubTypes({@JsonSubTypes.Type(name = "Activity", value = ActivityCustomEntityQuery.class)})
 @Fluent
 public class CustomEntityQuery extends ResourceWithEtag {
+    /** Creates an instance of CustomEntityQuery class. */
+    public CustomEntityQuery() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public CustomEntityQuery withEtag(String etag) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Customs.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Customs.java
index 9507f46b98de..af202dfab57d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Customs.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Customs.java
@@ -9,6 +9,10 @@
 /** Customs permissions required for the connector. */
 @Fluent
 public class Customs extends CustomsPermission {
+    /** Creates an instance of Customs class. */
+    public Customs() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public Customs withName(String name) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CustomsPermission.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CustomsPermission.java
index a7ade225346b..dd2fae784800 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CustomsPermission.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/CustomsPermission.java
@@ -22,6 +22,10 @@ public class CustomsPermission {
     @JsonProperty(value = "description")
     private String description;
 
+    /** Creates an instance of CustomsPermission class. */
+    public CustomsPermission() {
+    }
+
     /**
      * Get the name property: Customs permissions name.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorConnectBody.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorConnectBody.java
index 331014e42fa0..19be22844b50 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorConnectBody.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorConnectBody.java
@@ -79,6 +79,10 @@ public final class DataConnectorConnectBody {
     @JsonProperty(value = "requestConfigUserInputValues")
     private List<Object> requestConfigUserInputValues;
 
+    /** Creates an instance of DataConnectorConnectBody class. */
+    public DataConnectorConnectBody() {
+    }
+
     /**
      * Get the kind property: The authentication kind used to poll the data.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorDataTypeCommon.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorDataTypeCommon.java
index 936cd58c9114..3c8f4bb2d8f7 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorDataTypeCommon.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorDataTypeCommon.java
@@ -17,6 +17,10 @@ public class DataConnectorDataTypeCommon {
     @JsonProperty(value = "state", required = true)
     private DataTypeState state;
 
+    /** Creates an instance of DataConnectorDataTypeCommon class. */
+    public DataConnectorDataTypeCommon() {
+    }
+
     /**
      * Get the state property: Describe whether this data type connection is enabled or not.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorList.java
index 623d64d420bd..1b61de6441a5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorList.java
@@ -25,6 +25,10 @@ public final class DataConnectorList {
     @JsonProperty(value = "value", required = true)
     private List<DataConnectorInner> value;
 
+    /** Creates an instance of DataConnectorList class. */
+    public DataConnectorList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of data connectors.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorTenantId.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorTenantId.java
index 36d4914ce98b..518078c708dd 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorTenantId.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorTenantId.java
@@ -17,6 +17,10 @@ public class DataConnectorTenantId {
     @JsonProperty(value = "tenantId", required = true)
     private String tenantId;
 
+    /** Creates an instance of DataConnectorTenantId class. */
+    public DataConnectorTenantId() {
+    }
+
     /**
      * Get the tenantId property: The tenant id to connect to, and get the data from.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorWithAlertsProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorWithAlertsProperties.java
index e0bbbf5d0334..93fbfed69f7b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorWithAlertsProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorWithAlertsProperties.java
@@ -16,6 +16,10 @@ public class DataConnectorWithAlertsProperties {
     @JsonProperty(value = "dataTypes")
     private AlertsDataTypeOfDataConnector dataTypes;
 
+    /** Creates an instance of DataConnectorWithAlertsProperties class. */
+    public DataConnectorWithAlertsProperties() {
+    }
+
     /**
      * Get the dataTypes property: The available data types for the connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectors.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectors.java
index f80628152117..28edd0d5c9f4 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectors.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectors.java
@@ -36,19 +36,6 @@ public interface DataConnectors {
      */
     PagedIterable<DataConnector> list(String resourceGroupName, String workspaceName, Context context);
 
-    /**
-     * Gets a data connector.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param dataConnectorId Connector ID.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a data connector.
-     */
-    DataConnector get(String resourceGroupName, String workspaceName, String dataConnectorId);
-
     /**
      * Gets a data connector.
      *
@@ -65,19 +52,17 @@ Response<DataConnector> getWithResponse(
         String resourceGroupName, String workspaceName, String dataConnectorId, Context context);
 
     /**
-     * Creates or updates the data connector.
+     * Gets a data connector.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
-     * @param dataConnector The data connector.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return data connector.
+     * @return a data connector.
      */
-    DataConnector createOrUpdate(
-        String resourceGroupName, String workspaceName, String dataConnectorId, DataConnectorInner dataConnector);
+    DataConnector get(String resourceGroupName, String workspaceName, String dataConnectorId);
 
     /**
      * Creates or updates the data connector.
@@ -100,16 +85,19 @@ Response<DataConnector> createOrUpdateWithResponse(
         Context context);
 
     /**
-     * Delete the data connector.
+     * Creates or updates the data connector.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
+     * @param dataConnector The data connector.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return data connector.
      */
-    void delete(String resourceGroupName, String workspaceName, String dataConnectorId);
+    DataConnector createOrUpdate(
+        String resourceGroupName, String workspaceName, String dataConnectorId, DataConnectorInner dataConnector);
 
     /**
      * Delete the data connector.
@@ -127,18 +115,16 @@ Response<Void> deleteWithResponse(
         String resourceGroupName, String workspaceName, String dataConnectorId, Context context);
 
     /**
-     * Connects a data connector.
+     * Delete the data connector.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
-     * @param connectBody The data connector.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      */
-    void connect(
-        String resourceGroupName, String workspaceName, String dataConnectorId, DataConnectorConnectBody connectBody);
+    void delete(String resourceGroupName, String workspaceName, String dataConnectorId);
 
     /**
      * Connects a data connector.
@@ -161,16 +147,18 @@ Response<Void> connectWithResponse(
         Context context);
 
     /**
-     * Disconnect a data connector.
+     * Connects a data connector.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorId Connector ID.
+     * @param connectBody The data connector.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      */
-    void disconnect(String resourceGroupName, String workspaceName, String dataConnectorId);
+    void connect(
+        String resourceGroupName, String workspaceName, String dataConnectorId, DataConnectorConnectBody connectBody);
 
     /**
      * Disconnect a data connector.
@@ -186,4 +174,16 @@ Response<Void> connectWithResponse(
      */
     Response<Void> disconnectWithResponse(
         String resourceGroupName, String workspaceName, String dataConnectorId, Context context);
+
+    /**
+     * Disconnect a data connector.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param dataConnectorId Connector ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void disconnect(String resourceGroupName, String workspaceName, String dataConnectorId);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorsCheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorsCheckRequirements.java
index 57317f6ffc3c..a969dbd5c7f6 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorsCheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorsCheckRequirements.java
@@ -37,6 +37,10 @@
 })
 @Immutable
 public class DataConnectorsCheckRequirements {
+    /** Creates an instance of DataConnectorsCheckRequirements class. */
+    public DataConnectorsCheckRequirements() {
+    }
+
     /**
      * Validates the instance.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorsCheckRequirementsOperations.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorsCheckRequirementsOperations.java
index 6524d59b3515..ba642ba0695f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorsCheckRequirementsOperations.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataConnectorsCheckRequirementsOperations.java
@@ -15,15 +15,17 @@ public interface DataConnectorsCheckRequirementsOperations {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorsCheckRequirements The parameters for requirements check message.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return requirements state for a data connector type.
+     * @return requirements state for a data connector type along with {@link Response}.
      */
-    DataConnectorRequirementsState post(
+    Response<DataConnectorRequirementsState> postWithResponse(
         String resourceGroupName,
         String workspaceName,
-        DataConnectorsCheckRequirements dataConnectorsCheckRequirements);
+        DataConnectorsCheckRequirements dataConnectorsCheckRequirements,
+        Context context);
 
     /**
      * Get requirements state for a data connector type.
@@ -31,15 +33,13 @@ DataConnectorRequirementsState post(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param dataConnectorsCheckRequirements The parameters for requirements check message.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return requirements state for a data connector type along with {@link Response}.
+     * @return requirements state for a data connector type.
      */
-    Response<DataConnectorRequirementsState> postWithResponse(
+    DataConnectorRequirementsState post(
         String resourceGroupName,
         String workspaceName,
-        DataConnectorsCheckRequirements dataConnectorsCheckRequirements,
-        Context context);
+        DataConnectorsCheckRequirements dataConnectorsCheckRequirements);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataTypeDefinitions.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataTypeDefinitions.java
index 419ceca40540..445def19bebc 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataTypeDefinitions.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DataTypeDefinitions.java
@@ -16,6 +16,10 @@ public final class DataTypeDefinitions {
     @JsonProperty(value = "dataType")
     private String dataType;
 
+    /** Creates an instance of DataTypeDefinitions class. */
+    public DataTypeDefinitions() {
+    }
+
     /**
      * Get the dataType property: The data type name.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Deployment.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Deployment.java
index f500a22a553e..481720e7baa7 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Deployment.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Deployment.java
@@ -41,6 +41,10 @@ public final class Deployment {
     @JsonProperty(value = "deploymentLogsUrl")
     private String deploymentLogsUrl;
 
+    /** Creates an instance of Deployment class. */
+    public Deployment() {
+    }
+
     /**
      * Get the deploymentId property: Deployment identifier.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DeploymentInfo.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DeploymentInfo.java
index 6f8b486f4c2e..9a421b24d18a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DeploymentInfo.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DeploymentInfo.java
@@ -28,6 +28,10 @@ public final class DeploymentInfo {
     @JsonProperty(value = "message")
     private String message;
 
+    /** Creates an instance of DeploymentInfo class. */
+    public DeploymentInfo() {
+    }
+
     /**
      * Get the deploymentFetchStatus property: Status while fetching the last deployment.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DnsEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DnsEntity.java
index ed3969162e66..124789d2c435 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DnsEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DnsEntity.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.DnsEntityProperties;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityInner;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -16,7 +16,7 @@
 /** Represents a dns entity. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("DnsResolution")
-@Fluent
+@Immutable
 public final class DnsEntity extends EntityInner {
     /*
      * Dns entity properties
@@ -24,6 +24,10 @@ public final class DnsEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private DnsEntityProperties innerProperties;
 
+    /** Creates an instance of DnsEntity class. */
+    public DnsEntity() {
+    }
+
     /**
      * Get the innerProperties property: Dns entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DomainWhois.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DomainWhois.java
index 56380b6e2f98..6b7e5db81b59 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DomainWhois.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/DomainWhois.java
@@ -14,23 +14,23 @@ public interface DomainWhois {
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param domain Domain name to be enriched.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return whois information for a single domain name.
+     * @return whois information for a single domain name along with {@link Response}.
      */
-    EnrichmentDomainWhois get(String resourceGroupName, String domain);
+    Response<EnrichmentDomainWhois> getWithResponse(String resourceGroupName, String domain, Context context);
 
     /**
      * Get whois information for a single domain name.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param domain Domain name to be enriched.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return whois information for a single domain name along with {@link Response}.
+     * @return whois information for a single domain name.
      */
-    Response<EnrichmentDomainWhois> getWithResponse(String resourceGroupName, String domain, Context context);
+    EnrichmentDomainWhois get(String resourceGroupName, String domain);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Dynamics365CheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Dynamics365CheckRequirements.java
index eaa3c125f567..b35b1bd1a3dc 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Dynamics365CheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Dynamics365CheckRequirements.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.Dynamics365CheckRequirementsProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -13,7 +13,7 @@
 /** Represents Dynamics365 requirements check request. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("Dynamics365")
-@Fluent
+@Immutable
 public final class Dynamics365CheckRequirements extends DataConnectorsCheckRequirements {
     /*
      * Dynamics365 requirements check properties.
@@ -21,6 +21,10 @@ public final class Dynamics365CheckRequirements extends DataConnectorsCheckRequi
     @JsonProperty(value = "properties")
     private Dynamics365CheckRequirementsProperties innerProperties;
 
+    /** Creates an instance of Dynamics365CheckRequirements class. */
+    public Dynamics365CheckRequirements() {
+    }
+
     /**
      * Get the innerProperties property: Dynamics365 requirements check properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Dynamics365DataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Dynamics365DataConnector.java
index 653d886600c3..5ad9d53bce11 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Dynamics365DataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Dynamics365DataConnector.java
@@ -22,6 +22,10 @@ public final class Dynamics365DataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private Dynamics365DataConnectorProperties innerProperties;
 
+    /** Creates an instance of Dynamics365DataConnector class. */
+    public Dynamics365DataConnector() {
+    }
+
     /**
      * Get the innerProperties property: Dynamics365 data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Dynamics365DataConnectorDataTypes.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Dynamics365DataConnectorDataTypes.java
index 0df0a2723965..e85f4ef27e11 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Dynamics365DataConnectorDataTypes.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Dynamics365DataConnectorDataTypes.java
@@ -17,6 +17,10 @@ public final class Dynamics365DataConnectorDataTypes {
     @JsonProperty(value = "dynamics365CdsActivities", required = true)
     private Dynamics365DataConnectorDataTypesDynamics365CdsActivities dynamics365CdsActivities;
 
+    /** Creates an instance of Dynamics365DataConnectorDataTypes class. */
+    public Dynamics365DataConnectorDataTypes() {
+    }
+
     /**
      * Get the dynamics365CdsActivities property: Common Data Service data type connection.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Dynamics365DataConnectorDataTypesDynamics365CdsActivities.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Dynamics365DataConnectorDataTypesDynamics365CdsActivities.java
index d1ed289fd67c..779c71237841 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Dynamics365DataConnectorDataTypesDynamics365CdsActivities.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Dynamics365DataConnectorDataTypesDynamics365CdsActivities.java
@@ -9,6 +9,10 @@
 /** Common Data Service data type connection. */
 @Fluent
 public final class Dynamics365DataConnectorDataTypesDynamics365CdsActivities extends DataConnectorDataTypeCommon {
+    /** Creates an instance of Dynamics365DataConnectorDataTypesDynamics365CdsActivities class. */
+    public Dynamics365DataConnectorDataTypesDynamics365CdsActivities() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public Dynamics365DataConnectorDataTypesDynamics365CdsActivities withState(DataTypeState state) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EnrichmentDomainWhoisContact.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EnrichmentDomainWhoisContact.java
index d75c0f24e472..c49d22318903 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EnrichmentDomainWhoisContact.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EnrichmentDomainWhoisContact.java
@@ -71,6 +71,10 @@ public final class EnrichmentDomainWhoisContact {
     @JsonProperty(value = "email")
     private String email;
 
+    /** Creates an instance of EnrichmentDomainWhoisContact class. */
+    public EnrichmentDomainWhoisContact() {
+    }
+
     /**
      * Get the name property: The name of this contact.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EnrichmentDomainWhoisContacts.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EnrichmentDomainWhoisContacts.java
index 869d7a774b30..b7531a9759b2 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EnrichmentDomainWhoisContacts.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EnrichmentDomainWhoisContacts.java
@@ -34,6 +34,10 @@ public final class EnrichmentDomainWhoisContacts {
     @JsonProperty(value = "tech")
     private EnrichmentDomainWhoisContact tech;
 
+    /** Creates an instance of EnrichmentDomainWhoisContacts class. */
+    public EnrichmentDomainWhoisContacts() {
+    }
+
     /**
      * Get the admin property: The admin contact for this whois record.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EnrichmentDomainWhoisDetails.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EnrichmentDomainWhoisDetails.java
index 7a22dff870a6..75a8b2a8017d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EnrichmentDomainWhoisDetails.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EnrichmentDomainWhoisDetails.java
@@ -35,6 +35,10 @@ public final class EnrichmentDomainWhoisDetails {
     @JsonProperty(value = "statuses")
     private List<String> statuses;
 
+    /** Creates an instance of EnrichmentDomainWhoisDetails class. */
+    public EnrichmentDomainWhoisDetails() {
+    }
+
     /**
      * Get the registrar property: The registrar associated with this domain.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EnrichmentDomainWhoisRegistrarDetails.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EnrichmentDomainWhoisRegistrarDetails.java
index 545f2a28b66b..3fe8745eb42d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EnrichmentDomainWhoisRegistrarDetails.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EnrichmentDomainWhoisRegistrarDetails.java
@@ -46,6 +46,10 @@ public final class EnrichmentDomainWhoisRegistrarDetails {
     @JsonProperty(value = "whoisServer")
     private String whoisServer;
 
+    /** Creates an instance of EnrichmentDomainWhoisRegistrarDetails class. */
+    public EnrichmentDomainWhoisRegistrarDetails() {
+    }
+
     /**
      * Get the name property: The name of this registrar.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Entities.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Entities.java
index 182172f2a926..882cb668d371 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Entities.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Entities.java
@@ -35,19 +35,6 @@ public interface Entities {
      */
     PagedIterable<Entity> list(String resourceGroupName, String workspaceName, Context context);
 
-    /**
-     * Gets an entity.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param entityId entity ID.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity.
-     */
-    Entity get(String resourceGroupName, String workspaceName, String entityId);
-
     /**
      * Gets an entity.
      *
@@ -63,19 +50,17 @@ public interface Entities {
     Response<Entity> getWithResponse(String resourceGroupName, String workspaceName, String entityId, Context context);
 
     /**
-     * Expands an entity.
+     * Gets an entity.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
-     * @param parameters The parameters required to execute an expand operation on the given entity.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the entity expansion result operation response.
+     * @return an entity.
      */
-    EntityExpandResponse expand(
-        String resourceGroupName, String workspaceName, String entityId, EntityExpandParameters parameters);
+    Entity get(String resourceGroupName, String workspaceName, String entityId);
 
     /**
      * Expands an entity.
@@ -98,19 +83,19 @@ Response<EntityExpandResponse> expandWithResponse(
         Context context);
 
     /**
-     * Get Insights and Activities for an entity.
+     * Expands an entity.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
-     * @param kind The Kind parameter for queries.
+     * @param parameters The parameters required to execute an expand operation on the given entity.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return insights and Activities for an entity.
+     * @return the entity expansion result operation response.
      */
-    GetQueriesResponse queries(
-        String resourceGroupName, String workspaceName, String entityId, EntityItemQueryKind kind);
+    EntityExpandResponse expand(
+        String resourceGroupName, String workspaceName, String entityId, EntityExpandParameters parameters);
 
     /**
      * Get Insights and Activities for an entity.
@@ -129,19 +114,19 @@ Response<GetQueriesResponse> queriesWithResponse(
         String resourceGroupName, String workspaceName, String entityId, EntityItemQueryKind kind, Context context);
 
     /**
-     * Execute Insights for an entity.
+     * Get Insights and Activities for an entity.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
-     * @param parameters The parameters required to execute insights on the given entity.
+     * @param kind The Kind parameter for queries.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Get Insights result operation response.
+     * @return insights and Activities for an entity.
      */
-    EntityGetInsightsResponse getInsights(
-        String resourceGroupName, String workspaceName, String entityId, EntityGetInsightsParameters parameters);
+    GetQueriesResponse queries(
+        String resourceGroupName, String workspaceName, String entityId, EntityItemQueryKind kind);
 
     /**
      * Execute Insights for an entity.
@@ -162,4 +147,19 @@ Response<EntityGetInsightsResponse> getInsightsWithResponse(
         String entityId,
         EntityGetInsightsParameters parameters,
         Context context);
+
+    /**
+     * Execute Insights for an entity.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param entityId entity ID.
+     * @param parameters The parameters required to execute insights on the given entity.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the Get Insights result operation response.
+     */
+    EntityGetInsightsResponse getInsights(
+        String resourceGroupName, String workspaceName, String entityId, EntityGetInsightsParameters parameters);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntitiesGetTimelines.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntitiesGetTimelines.java
index 29a184b1bde3..faac913312c8 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntitiesGetTimelines.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntitiesGetTimelines.java
@@ -16,13 +16,18 @@ public interface EntitiesGetTimelines {
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param parameters The parameters required to execute an timeline operation on the given entity.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the entity timeline result operation response.
+     * @return the entity timeline result operation response along with {@link Response}.
      */
-    EntityTimelineResponse list(
-        String resourceGroupName, String workspaceName, String entityId, EntityTimelineParameters parameters);
+    Response<EntityTimelineResponse> listWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String entityId,
+        EntityTimelineParameters parameters,
+        Context context);
 
     /**
      * Timeline for an entity.
@@ -31,16 +36,11 @@ EntityTimelineResponse list(
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param parameters The parameters required to execute an timeline operation on the given entity.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the entity timeline result operation response along with {@link Response}.
+     * @return the entity timeline result operation response.
      */
-    Response<EntityTimelineResponse> listWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String entityId,
-        EntityTimelineParameters parameters,
-        Context context);
+    EntityTimelineResponse list(
+        String resourceGroupName, String workspaceName, String entityId, EntityTimelineParameters parameters);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityAnalytics.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityAnalytics.java
index 7ebdadd6fc3c..7d596084948a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityAnalytics.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityAnalytics.java
@@ -23,6 +23,10 @@ public final class EntityAnalytics extends SettingsInner {
     @JsonProperty(value = "properties")
     private EntityAnalyticsProperties innerProperties;
 
+    /** Creates an instance of EntityAnalytics class. */
+    public EntityAnalytics() {
+    }
+
     /**
      * Get the innerProperties property: EntityAnalytics properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityCommonProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityCommonProperties.java
index 49d3c8f895a1..5252752f3fb1 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityCommonProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityCommonProperties.java
@@ -26,6 +26,10 @@ public class EntityCommonProperties {
     @JsonProperty(value = "friendlyName", access = JsonProperty.Access.WRITE_ONLY)
     private String friendlyName;
 
+    /** Creates an instance of EntityCommonProperties class. */
+    public EntityCommonProperties() {
+    }
+
     /**
      * Get the additionalData property: A bag of custom fields that should be part of the entity and will be presented
      * to the user.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityEdges.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityEdges.java
index e925912285eb..92eb022c689d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityEdges.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityEdges.java
@@ -25,6 +25,10 @@ public final class EntityEdges {
     @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, Object> additionalData;
 
+    /** Creates an instance of EntityEdges class. */
+    public EntityEdges() {
+    }
+
     /**
      * Get the targetEntityId property: The target entity Id.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityExpandParameters.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityExpandParameters.java
index 8d0d6ec6ebdc..d577a3d079d7 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityExpandParameters.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityExpandParameters.java
@@ -30,6 +30,10 @@ public final class EntityExpandParameters {
     @JsonProperty(value = "startTime")
     private OffsetDateTime startTime;
 
+    /** Creates an instance of EntityExpandParameters class. */
+    public EntityExpandParameters() {
+    }
+
     /**
      * Get the endTime property: The end date filter, so the only expansion results returned are before this date.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityExpandResponseValue.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityExpandResponseValue.java
index f8558de18c34..839192828e36 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityExpandResponseValue.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityExpandResponseValue.java
@@ -24,6 +24,10 @@ public final class EntityExpandResponseValue {
     @JsonProperty(value = "edges")
     private List<EntityEdges> edges;
 
+    /** Creates an instance of EntityExpandResponseValue class. */
+    public EntityExpandResponseValue() {
+    }
+
     /**
      * Get the entities property: Array of the expansion result entities.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityFieldMapping.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityFieldMapping.java
index 0d2682840793..7c6b4b3ae136 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityFieldMapping.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityFieldMapping.java
@@ -22,6 +22,10 @@ public final class EntityFieldMapping {
     @JsonProperty(value = "value")
     private String value;
 
+    /** Creates an instance of EntityFieldMapping class. */
+    public EntityFieldMapping() {
+    }
+
     /**
      * Get the identifier property: Alert V3 identifier.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityGetInsightsParameters.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityGetInsightsParameters.java
index 04a3e0d4c530..23167eecede9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityGetInsightsParameters.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityGetInsightsParameters.java
@@ -38,6 +38,10 @@ public final class EntityGetInsightsParameters {
     @JsonProperty(value = "insightQueryIds")
     private List<UUID> insightQueryIds;
 
+    /** Creates an instance of EntityGetInsightsParameters class. */
+    public EntityGetInsightsParameters() {
+    }
+
     /**
      * Get the startTime property: The start timeline date, so the results returned are after this date.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityInsightItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityInsightItem.java
index 15d19b7473a9..6fd53f2bd08d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityInsightItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityInsightItem.java
@@ -35,6 +35,10 @@ public final class EntityInsightItem {
     @JsonProperty(value = "chartQueryResults")
     private List<InsightsTableResult> chartQueryResults;
 
+    /** Creates an instance of EntityInsightItem class. */
+    public EntityInsightItem() {
+    }
+
     /**
      * Get the queryId property: The query id of the insight.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityInsightItemQueryTimeInterval.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityInsightItemQueryTimeInterval.java
index e04c157d5dc6..a2e6328b624b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityInsightItemQueryTimeInterval.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityInsightItemQueryTimeInterval.java
@@ -23,6 +23,10 @@ public final class EntityInsightItemQueryTimeInterval {
     @JsonProperty(value = "endTime")
     private OffsetDateTime endTime;
 
+    /** Creates an instance of EntityInsightItemQueryTimeInterval class. */
+    public EntityInsightItemQueryTimeInterval() {
+    }
+
     /**
      * Get the startTime property: Insight query start time.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityList.java
index 0e160998fea5..04067d516bde 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityList.java
@@ -25,6 +25,10 @@ public final class EntityList {
     @JsonProperty(value = "value", required = true)
     private List<EntityInner> value;
 
+    /** Creates an instance of EntityList class. */
+    public EntityList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of entities.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityMapping.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityMapping.java
index b5081a9937a3..f0fb60fa302b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityMapping.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityMapping.java
@@ -23,6 +23,10 @@ public final class EntityMapping {
     @JsonProperty(value = "fieldMappings")
     private List<FieldMapping> fieldMappings;
 
+    /** Creates an instance of EntityMapping class. */
+    public EntityMapping() {
+    }
+
     /**
      * Get the entityType property: The V3 type of the mapped entity.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueries.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueries.java
index d0f22a8e74b0..eafaf9305483 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueries.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueries.java
@@ -37,19 +37,6 @@ public interface EntityQueries {
     PagedIterable<EntityQuery> list(
         String resourceGroupName, String workspaceName, EntityQueriesKind kind, Context context);
 
-    /**
-     * Gets an entity query.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param entityQueryId entity query ID.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity query.
-     */
-    EntityQuery get(String resourceGroupName, String workspaceName, String entityQueryId);
-
     /**
      * Gets an entity query.
      *
@@ -66,19 +53,17 @@ Response<EntityQuery> getWithResponse(
         String resourceGroupName, String workspaceName, String entityQueryId, Context context);
 
     /**
-     * Creates or updates the entity query.
+     * Gets an entity query.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityQueryId entity query ID.
-     * @param entityQuery The entity query we want to create or update.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return specific entity query.
+     * @return an entity query.
      */
-    EntityQuery createOrUpdate(
-        String resourceGroupName, String workspaceName, String entityQueryId, CustomEntityQuery entityQuery);
+    EntityQuery get(String resourceGroupName, String workspaceName, String entityQueryId);
 
     /**
      * Creates or updates the entity query.
@@ -101,16 +86,19 @@ Response<EntityQuery> createOrUpdateWithResponse(
         Context context);
 
     /**
-     * Delete the entity query.
+     * Creates or updates the entity query.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityQueryId entity query ID.
+     * @param entityQuery The entity query we want to create or update.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return specific entity query.
      */
-    void delete(String resourceGroupName, String workspaceName, String entityQueryId);
+    EntityQuery createOrUpdate(
+        String resourceGroupName, String workspaceName, String entityQueryId, CustomEntityQuery entityQuery);
 
     /**
      * Delete the entity query.
@@ -126,4 +114,16 @@ Response<EntityQuery> createOrUpdateWithResponse(
      */
     Response<Void> deleteWithResponse(
         String resourceGroupName, String workspaceName, String entityQueryId, Context context);
+
+    /**
+     * Delete the entity query.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param entityQueryId entity query ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void delete(String resourceGroupName, String workspaceName, String entityQueryId);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryItem.java
index edd51be3360f..318171a59bbb 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryItem.java
@@ -38,6 +38,10 @@ public class EntityQueryItem {
     @JsonProperty(value = "type")
     private String type;
 
+    /** Creates an instance of EntityQueryItem class. */
+    public EntityQueryItem() {
+    }
+
     /**
      * Get the id property: Query Template ARM ID.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryItemProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryItemProperties.java
index b1a3ce1e859b..744ff5213ac4 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryItemProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryItemProperties.java
@@ -35,6 +35,10 @@ public class EntityQueryItemProperties {
     @JsonProperty(value = "entitiesFilter")
     private Object entitiesFilter;
 
+    /** Creates an instance of EntityQueryItemProperties class. */
+    public EntityQueryItemProperties() {
+    }
+
     /**
      * Get the dataTypes property: Data types for template.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryItemPropertiesDataTypesItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryItemPropertiesDataTypesItem.java
index f5b1c7988945..66524d5493a0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryItemPropertiesDataTypesItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryItemPropertiesDataTypesItem.java
@@ -16,6 +16,10 @@ public final class EntityQueryItemPropertiesDataTypesItem {
     @JsonProperty(value = "dataType")
     private String dataType;
 
+    /** Creates an instance of EntityQueryItemPropertiesDataTypesItem class. */
+    public EntityQueryItemPropertiesDataTypesItem() {
+    }
+
     /**
      * Get the dataType property: Data type name.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryList.java
index 28db9eb06460..6c4c8f1653b6 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryList.java
@@ -25,6 +25,10 @@ public final class EntityQueryList {
     @JsonProperty(value = "value", required = true)
     private List<EntityQueryInner> value;
 
+    /** Creates an instance of EntityQueryList class. */
+    public EntityQueryList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of entity queries.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryTemplateList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryTemplateList.java
index a767e8fea94d..fe91f55f8546 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryTemplateList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryTemplateList.java
@@ -25,6 +25,10 @@ public final class EntityQueryTemplateList {
     @JsonProperty(value = "value", required = true)
     private List<EntityQueryTemplateInner> value;
 
+    /** Creates an instance of EntityQueryTemplateList class. */
+    public EntityQueryTemplateList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of entity query templates.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryTemplates.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryTemplates.java
index 4bddc9d19d91..7b04b2de042b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryTemplates.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityQueryTemplates.java
@@ -35,7 +35,7 @@ public interface EntityQueryTemplates {
      * @return all entity query templates as paginated response with {@link PagedIterable}.
      */
     PagedIterable<EntityQueryTemplate> list(
-        String resourceGroupName, String workspaceName, Constant88 kind, Context context);
+        String resourceGroupName, String workspaceName, Constant90 kind, Context context);
 
     /**
      * Gets an entity query.
@@ -43,12 +43,14 @@ PagedIterable<EntityQueryTemplate> list(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityQueryTemplateId entity query template ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity query.
+     * @return an entity query along with {@link Response}.
      */
-    EntityQueryTemplate get(String resourceGroupName, String workspaceName, String entityQueryTemplateId);
+    Response<EntityQueryTemplate> getWithResponse(
+        String resourceGroupName, String workspaceName, String entityQueryTemplateId, Context context);
 
     /**
      * Gets an entity query.
@@ -56,12 +58,10 @@ PagedIterable<EntityQueryTemplate> list(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param entityQueryTemplateId entity query template ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity query along with {@link Response}.
+     * @return an entity query.
      */
-    Response<EntityQueryTemplate> getWithResponse(
-        String resourceGroupName, String workspaceName, String entityQueryTemplateId, Context context);
+    EntityQueryTemplate get(String resourceGroupName, String workspaceName, String entityQueryTemplateId);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityRelations.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityRelations.java
index 28d08ca8e271..0ce15bc7a8ed 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityRelations.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityRelations.java
@@ -16,12 +16,14 @@ public interface EntityRelations {
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param relationName Relation Name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity relation.
+     * @return an entity relation along with {@link Response}.
      */
-    Relation getRelation(String resourceGroupName, String workspaceName, String entityId, String relationName);
+    Response<Relation> getRelationWithResponse(
+        String resourceGroupName, String workspaceName, String entityId, String relationName, Context context);
 
     /**
      * Gets an entity relation.
@@ -30,12 +32,10 @@ public interface EntityRelations {
      * @param workspaceName The name of the workspace.
      * @param entityId entity ID.
      * @param relationName Relation Name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an entity relation along with {@link Response}.
+     * @return an entity relation.
      */
-    Response<Relation> getRelationWithResponse(
-        String resourceGroupName, String workspaceName, String entityId, String relationName, Context context);
+    Relation getRelation(String resourceGroupName, String workspaceName, String entityId, String relationName);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityTimelineItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityTimelineItem.java
index fff8bc912310..e366cf19eccd 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityTimelineItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityTimelineItem.java
@@ -24,6 +24,10 @@
 })
 @Immutable
 public class EntityTimelineItem {
+    /** Creates an instance of EntityTimelineItem class. */
+    public EntityTimelineItem() {
+    }
+
     /**
      * Validates the instance.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityTimelineParameters.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityTimelineParameters.java
index 5f024f5132c6..59bf6540f785 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityTimelineParameters.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EntityTimelineParameters.java
@@ -37,6 +37,10 @@ public final class EntityTimelineParameters {
     @JsonProperty(value = "numberOfBucket")
     private Integer numberOfBucket;
 
+    /** Creates an instance of EntityTimelineParameters class. */
+    public EntityTimelineParameters() {
+    }
+
     /**
      * Get the kinds property: Array of timeline Item kinds.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EventGroupingSettings.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EventGroupingSettings.java
index ed1b01e323bc..edfd15554d59 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EventGroupingSettings.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EventGroupingSettings.java
@@ -16,6 +16,10 @@ public final class EventGroupingSettings {
     @JsonProperty(value = "aggregationKind")
     private EventGroupingAggregationKind aggregationKind;
 
+    /** Creates an instance of EventGroupingSettings class. */
+    public EventGroupingSettings() {
+    }
+
     /**
      * Get the aggregationKind property: The event grouping aggregation kinds.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ExpansionEntityQuery.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ExpansionEntityQuery.java
index 368b2563e16c..f3bb9316041d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ExpansionEntityQuery.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ExpansionEntityQuery.java
@@ -23,6 +23,10 @@ public final class ExpansionEntityQuery extends EntityQueryInner {
     @JsonProperty(value = "properties")
     private ExpansionEntityQueriesProperties innerProperties;
 
+    /** Creates an instance of ExpansionEntityQuery class. */
+    public ExpansionEntityQuery() {
+    }
+
     /**
      * Get the innerProperties property: Expansion entity query properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ExpansionResultAggregation.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ExpansionResultAggregation.java
index a3620d7458fc..7e6e4f9a8c4b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ExpansionResultAggregation.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ExpansionResultAggregation.java
@@ -35,6 +35,10 @@ public final class ExpansionResultAggregation {
     @JsonProperty(value = "entityKind", required = true)
     private EntityKind entityKind;
 
+    /** Creates an instance of ExpansionResultAggregation class. */
+    public ExpansionResultAggregation() {
+    }
+
     /**
      * Get the aggregationType property: The common type of the aggregation. (for e.g. entity field name).
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ExpansionResultsMetadata.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ExpansionResultsMetadata.java
index 79231d5f4fcd..af4b80695782 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ExpansionResultsMetadata.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ExpansionResultsMetadata.java
@@ -17,6 +17,10 @@ public final class ExpansionResultsMetadata {
     @JsonProperty(value = "aggregations")
     private List<ExpansionResultAggregation> aggregations;
 
+    /** Creates an instance of ExpansionResultsMetadata class. */
+    public ExpansionResultsMetadata() {
+    }
+
     /**
      * Get the aggregations property: Information of the aggregated nodes in the expansion result.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EyesOn.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EyesOn.java
index 05d0db1cba99..9e804778c4f8 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EyesOn.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/EyesOn.java
@@ -22,6 +22,10 @@ public final class EyesOn extends SettingsInner {
     @JsonProperty(value = "properties")
     private EyesOnSettingsProperties innerProperties;
 
+    /** Creates an instance of EyesOn class. */
+    public EyesOn() {
+    }
+
     /**
      * Get the innerProperties property: EyesOn properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FieldMapping.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FieldMapping.java
index d01e4fca5f25..218cfb57f5d2 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FieldMapping.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FieldMapping.java
@@ -22,6 +22,10 @@ public final class FieldMapping {
     @JsonProperty(value = "columnName")
     private String columnName;
 
+    /** Creates an instance of FieldMapping class. */
+    public FieldMapping() {
+    }
+
     /**
      * Get the identifier property: the V3 identifier of the entity.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileEntity.java
index 7cfc51143dbb..6d0cb7f7b9d8 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileEntity.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityInner;
 import com.azure.resourcemanager.securityinsights.fluent.models.FileEntityProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -16,7 +16,7 @@
 /** Represents a file entity. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("File")
-@Fluent
+@Immutable
 public final class FileEntity extends EntityInner {
     /*
      * File entity properties
@@ -24,6 +24,10 @@ public final class FileEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private FileEntityProperties innerProperties;
 
+    /** Creates an instance of FileEntity class. */
+    public FileEntity() {
+    }
+
     /**
      * Get the innerProperties property: File entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileHashEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileHashEntity.java
index d6252ed9ffe6..435e7ea88982 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileHashEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileHashEntity.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityInner;
 import com.azure.resourcemanager.securityinsights.fluent.models.FileHashEntityProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -15,7 +15,7 @@
 /** Represents a file hash entity. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("FileHash")
-@Fluent
+@Immutable
 public final class FileHashEntity extends EntityInner {
     /*
      * FileHash entity properties
@@ -23,6 +23,10 @@ public final class FileHashEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private FileHashEntityProperties innerProperties;
 
+    /** Creates an instance of FileHashEntity class. */
+    public FileHashEntity() {
+    }
+
     /**
      * Get the innerProperties property: FileHash entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileImportList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileImportList.java
index 5037750b2957..89d7423c4a51 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileImportList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileImportList.java
@@ -25,6 +25,10 @@ public final class FileImportList {
     @JsonProperty(value = "value", required = true)
     private List<FileImportInner> value;
 
+    /** Creates an instance of FileImportList class. */
+    public FileImportList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of file imports.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileImports.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileImports.java
index ae0a2d6348d2..2d077559c476 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileImports.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileImports.java
@@ -54,12 +54,14 @@ PagedIterable<FileImport> list(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param fileImportId File import ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a file import.
+     * @return a file import along with {@link Response}.
      */
-    FileImport get(String resourceGroupName, String workspaceName, String fileImportId);
+    Response<FileImport> getWithResponse(
+        String resourceGroupName, String workspaceName, String fileImportId, Context context);
 
     /**
      * Gets a file import.
@@ -67,14 +69,12 @@ PagedIterable<FileImport> list(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param fileImportId File import ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a file import along with {@link Response}.
+     * @return a file import.
      */
-    Response<FileImport> getWithResponse(
-        String resourceGroupName, String workspaceName, String fileImportId, Context context);
+    FileImport get(String resourceGroupName, String workspaceName, String fileImportId);
 
     /**
      * Delete the file import.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileMetadata.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileMetadata.java
index 39027c4f608c..2f7e6eae298d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileMetadata.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FileMetadata.java
@@ -40,6 +40,10 @@ public final class FileMetadata {
     @JsonProperty(value = "deleteStatus", access = JsonProperty.Access.WRITE_ONLY)
     private DeleteStatus deleteStatus;
 
+    /** Creates an instance of FileMetadata class. */
+    public FileMetadata() {
+    }
+
     /**
      * Get the fileFormat property: The format of the file.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionAlertRule.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionAlertRule.java
index 792e517d8d10..e4da3b1c6f15 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionAlertRule.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionAlertRule.java
@@ -24,6 +24,10 @@ public final class FusionAlertRule extends AlertRuleInner {
     @JsonProperty(value = "properties")
     private FusionAlertRuleProperties innerProperties;
 
+    /** Creates an instance of FusionAlertRule class. */
+    public FusionAlertRule() {
+    }
+
     /**
      * Get the innerProperties property: Fusion alert rule properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionAlertRuleTemplate.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionAlertRuleTemplate.java
index ce4da38707f0..e8d4cfadb18d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionAlertRuleTemplate.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionAlertRuleTemplate.java
@@ -24,6 +24,10 @@ public final class FusionAlertRuleTemplate extends AlertRuleTemplateInner {
     @JsonProperty(value = "properties")
     private FusionAlertRuleTemplateProperties innerProperties;
 
+    /** Creates an instance of FusionAlertRuleTemplate class. */
+    public FusionAlertRuleTemplate() {
+    }
+
     /**
      * Get the innerProperties property: Fusion alert rule template properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionScenarioExclusionPattern.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionScenarioExclusionPattern.java
index 018fafeb7256..d842490715ce 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionScenarioExclusionPattern.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionScenarioExclusionPattern.java
@@ -23,6 +23,10 @@ public final class FusionScenarioExclusionPattern {
     @JsonProperty(value = "dateAddedInUTC", required = true)
     private String dateAddedInUtc;
 
+    /** Creates an instance of FusionScenarioExclusionPattern class. */
+    public FusionScenarioExclusionPattern() {
+    }
+
     /**
      * Get the exclusionPattern property: Scenario exclusion pattern.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionSourceSettings.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionSourceSettings.java
index e551140636d8..12e0f1644634 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionSourceSettings.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionSourceSettings.java
@@ -30,6 +30,10 @@ public final class FusionSourceSettings {
     @JsonProperty(value = "sourceSubTypes")
     private List<FusionSourceSubTypeSetting> sourceSubTypes;
 
+    /** Creates an instance of FusionSourceSettings class. */
+    public FusionSourceSettings() {
+    }
+
     /**
      * Get the enabled property: Determines whether this source signal is enabled or disabled in Fusion detection.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionSourceSubTypeSetting.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionSourceSubTypeSetting.java
index cdf5cd5f9269..7c45ee6c6e36 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionSourceSubTypeSetting.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionSourceSubTypeSetting.java
@@ -36,6 +36,10 @@ public final class FusionSourceSubTypeSetting {
     @JsonProperty(value = "severityFilters", required = true)
     private FusionSubTypeSeverityFilter severityFilters;
 
+    /** Creates an instance of FusionSourceSubTypeSetting class. */
+    public FusionSourceSubTypeSetting() {
+    }
+
     /**
      * Get the enabled property: Determines whether this source subtype under source signal is enabled or disabled in
      * Fusion detection.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionSubTypeSeverityFilter.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionSubTypeSeverityFilter.java
index c6ae35c72337..8f7925947c21 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionSubTypeSeverityFilter.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionSubTypeSeverityFilter.java
@@ -23,6 +23,10 @@ public final class FusionSubTypeSeverityFilter {
     @JsonProperty(value = "filters")
     private List<FusionSubTypeSeverityFiltersItem> filters;
 
+    /** Creates an instance of FusionSubTypeSeverityFilter class. */
+    public FusionSubTypeSeverityFilter() {
+    }
+
     /**
      * Get the isSupported property: Determines whether this source subtype supports severity configuration or not.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionSubTypeSeverityFiltersItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionSubTypeSeverityFiltersItem.java
index 0892d2a46323..f1c43ed81d15 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionSubTypeSeverityFiltersItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionSubTypeSeverityFiltersItem.java
@@ -23,6 +23,10 @@ public final class FusionSubTypeSeverityFiltersItem {
     @JsonProperty(value = "enabled", required = true)
     private boolean enabled;
 
+    /** Creates an instance of FusionSubTypeSeverityFiltersItem class. */
+    public FusionSubTypeSeverityFiltersItem() {
+    }
+
     /**
      * Get the severity property: The Severity for a given source subtype consumed in Fusion detection.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionTemplateSourceSetting.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionTemplateSourceSetting.java
index 1f2111a56b48..985a2b1a32ca 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionTemplateSourceSetting.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionTemplateSourceSetting.java
@@ -24,6 +24,10 @@ public final class FusionTemplateSourceSetting {
     @JsonProperty(value = "sourceSubTypes")
     private List<FusionTemplateSourceSubType> sourceSubTypes;
 
+    /** Creates an instance of FusionTemplateSourceSetting class. */
+    public FusionTemplateSourceSetting() {
+    }
+
     /**
      * Get the sourceName property: The name of a source signal consumed in Fusion detection.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionTemplateSourceSubType.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionTemplateSourceSubType.java
index 89bfdf241a52..ddbbf8b4bcc5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionTemplateSourceSubType.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionTemplateSourceSubType.java
@@ -29,6 +29,10 @@ public final class FusionTemplateSourceSubType {
     @JsonProperty(value = "severityFilter", required = true)
     private FusionTemplateSubTypeSeverityFilter severityFilter;
 
+    /** Creates an instance of FusionTemplateSourceSubType class. */
+    public FusionTemplateSourceSubType() {
+    }
+
     /**
      * Get the sourceSubTypeName property: The name of source subtype under a source signal consumed in Fusion
      * detection.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionTemplateSubTypeSeverityFilter.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionTemplateSubTypeSeverityFilter.java
index ef8388621d5a..da2fa6c2ba1f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionTemplateSubTypeSeverityFilter.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/FusionTemplateSubTypeSeverityFilter.java
@@ -23,6 +23,10 @@ public final class FusionTemplateSubTypeSeverityFilter {
     @JsonProperty(value = "severityFilters")
     private List<AlertSeverity> severityFilters;
 
+    /** Creates an instance of FusionTemplateSubTypeSeverityFilter class. */
+    public FusionTemplateSubTypeSeverityFilter() {
+    }
+
     /**
      * Get the isSupported property: Determines whether severity configuration is supported for this source subtype
      * consumed in Fusion detection.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GeoLocation.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GeoLocation.java
index 675f38adbbe9..5f7e0a8e0b86 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GeoLocation.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GeoLocation.java
@@ -56,6 +56,10 @@ public final class GeoLocation {
     @JsonProperty(value = "state", access = JsonProperty.Access.WRITE_ONLY)
     private String state;
 
+    /** Creates an instance of GeoLocation class. */
+    public GeoLocation() {
+    }
+
     /**
      * Get the asn property: Autonomous System Number.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GetInsightsErrorKind.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GetInsightsErrorKind.java
index 8717c6a073ff..904c40c3ce59 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GetInsightsErrorKind.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GetInsightsErrorKind.java
@@ -29,6 +29,10 @@ public final class GetInsightsErrorKind {
     @JsonProperty(value = "errorMessage", required = true)
     private String errorMessage;
 
+    /** Creates an instance of GetInsightsErrorKind class. */
+    public GetInsightsErrorKind() {
+    }
+
     /**
      * Get the kind property: the query kind.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GetInsightsResultsMetadata.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GetInsightsResultsMetadata.java
index c02767abf5e7..9db745d5f221 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GetInsightsResultsMetadata.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GetInsightsResultsMetadata.java
@@ -23,6 +23,10 @@ public final class GetInsightsResultsMetadata {
     @JsonProperty(value = "errors")
     private List<GetInsightsErrorKind> errors;
 
+    /** Creates an instance of GetInsightsResultsMetadata class. */
+    public GetInsightsResultsMetadata() {
+    }
+
     /**
      * Get the totalCount property: the total items found for the insights request.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GitHubResourceInfo.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GitHubResourceInfo.java
index 07ee2d932d26..f3f8fe110c3d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GitHubResourceInfo.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GitHubResourceInfo.java
@@ -16,6 +16,10 @@ public final class GitHubResourceInfo {
     @JsonProperty(value = "appInstallationId")
     private String appInstallationId;
 
+    /** Creates an instance of GitHubResourceInfo class. */
+    public GitHubResourceInfo() {
+    }
+
     /**
      * Get the appInstallationId property: GitHub application installation id.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GraphQueries.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GraphQueries.java
index a0f7e3b56450..5085def4d731 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GraphQueries.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GraphQueries.java
@@ -28,6 +28,10 @@ public class GraphQueries {
     @JsonProperty(value = "baseQuery")
     private String baseQuery;
 
+    /** Creates an instance of GraphQueries class. */
+    public GraphQueries() {
+    }
+
     /**
      * Get the metricName property: the metric that the query is checking.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GroupingConfiguration.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GroupingConfiguration.java
index c6a5e97fd9ca..4bdfe6f01688 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GroupingConfiguration.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/GroupingConfiguration.java
@@ -58,6 +58,10 @@ public final class GroupingConfiguration {
     @JsonProperty(value = "groupByCustomDetails")
     private List<String> groupByCustomDetails;
 
+    /** Creates an instance of GroupingConfiguration class. */
+    public GroupingConfiguration() {
+    }
+
     /**
      * Get the enabled property: Grouping enabled.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/HostEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/HostEntity.java
index 08e75c45b2b3..7c681299dd38 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/HostEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/HostEntity.java
@@ -23,6 +23,10 @@ public final class HostEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private HostEntityProperties innerProperties;
 
+    /** Creates an instance of HostEntity class. */
+    public HostEntity() {
+    }
+
     /**
      * Get the innerProperties property: Host entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/HuntingBookmark.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/HuntingBookmark.java
index 3ea294c0b3b5..33239610c797 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/HuntingBookmark.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/HuntingBookmark.java
@@ -25,6 +25,10 @@ public final class HuntingBookmark extends EntityInner {
     @JsonProperty(value = "properties")
     private HuntingBookmarkProperties innerProperties;
 
+    /** Creates an instance of HuntingBookmark class. */
+    public HuntingBookmark() {
+    }
+
     /**
      * Get the innerProperties property: HuntingBookmark entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Incident.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Incident.java
index 2d051e853f0f..80a10658ab8a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Incident.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Incident.java
@@ -616,17 +616,6 @@ interface WithTitle {
      */
     Incident refresh(Context context);
 
-    /**
-     * Creates a Microsoft team to investigate the incident by sharing information and insights between participants.
-     *
-     * @param teamProperties Team properties.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes team information.
-     */
-    TeamInformation createTeam(TeamProperties teamProperties);
-
     /**
      * Creates a Microsoft team to investigate the incident by sharing information and insights between participants.
      *
@@ -640,13 +629,15 @@ interface WithTitle {
     Response<TeamInformation> createTeamWithResponse(TeamProperties teamProperties, Context context);
 
     /**
-     * Gets all incident alerts.
+     * Creates a Microsoft team to investigate the incident by sharing information and insights between participants.
      *
+     * @param teamProperties Team properties.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all incident alerts.
+     * @return describes team information.
      */
-    IncidentAlertList listAlerts();
+    TeamInformation createTeam(TeamProperties teamProperties);
 
     /**
      * Gets all incident alerts.
@@ -660,13 +651,13 @@ interface WithTitle {
     Response<IncidentAlertList> listAlertsWithResponse(Context context);
 
     /**
-     * Gets all incident bookmarks.
+     * Gets all incident alerts.
      *
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all incident bookmarks.
+     * @return all incident alerts.
      */
-    IncidentBookmarkList listBookmarks();
+    IncidentAlertList listAlerts();
 
     /**
      * Gets all incident bookmarks.
@@ -680,13 +671,13 @@ interface WithTitle {
     Response<IncidentBookmarkList> listBookmarksWithResponse(Context context);
 
     /**
-     * Gets all incident related entities.
+     * Gets all incident bookmarks.
      *
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all incident related entities.
+     * @return all incident bookmarks.
      */
-    IncidentEntitiesResponse listEntities();
+    IncidentBookmarkList listBookmarks();
 
     /**
      * Gets all incident related entities.
@@ -698,4 +689,13 @@ interface WithTitle {
      * @return all incident related entities along with {@link Response}.
      */
     Response<IncidentEntitiesResponse> listEntitiesWithResponse(Context context);
+
+    /**
+     * Gets all incident related entities.
+     *
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return all incident related entities.
+     */
+    IncidentEntitiesResponse listEntities();
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentAdditionalData.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentAdditionalData.java
index f86ce54b9f24..7979509245fa 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentAdditionalData.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentAdditionalData.java
@@ -53,6 +53,10 @@ public final class IncidentAdditionalData {
     @JsonProperty(value = "techniques", access = JsonProperty.Access.WRITE_ONLY)
     private List<String> techniques;
 
+    /** Creates an instance of IncidentAdditionalData class. */
+    public IncidentAdditionalData() {
+    }
+
     /**
      * Get the alertsCount property: The number of alerts in the incident.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentCommentList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentCommentList.java
index 2304ded52a75..732b69bcb2d3 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentCommentList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentCommentList.java
@@ -25,6 +25,10 @@ public final class IncidentCommentList {
     @JsonProperty(value = "value", required = true)
     private List<IncidentCommentInner> value;
 
+    /** Creates an instance of IncidentCommentList class. */
+    public IncidentCommentList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of comments.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentComments.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentComments.java
index 3e39bb7cd39c..9844c3898eb2 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentComments.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentComments.java
@@ -58,12 +58,14 @@ PagedIterable<IncidentComment> list(
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param incidentCommentId Incident comment ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an incident comment.
+     * @return an incident comment along with {@link Response}.
      */
-    IncidentComment get(String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId);
+    Response<IncidentComment> getWithResponse(
+        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId, Context context);
 
     /**
      * Gets an incident comment.
@@ -72,14 +74,12 @@ PagedIterable<IncidentComment> list(
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param incidentCommentId Incident comment ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an incident comment along with {@link Response}.
+     * @return an incident comment.
      */
-    Response<IncidentComment> getWithResponse(
-        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId, Context context);
+    IncidentComment get(String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId);
 
     /**
      * Delete the incident comment.
@@ -88,11 +88,14 @@ Response<IncidentComment> getWithResponse(
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param incidentCommentId Incident comment ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
-    void delete(String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId);
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId, Context context);
 
     /**
      * Delete the incident comment.
@@ -101,14 +104,11 @@ Response<IncidentComment> getWithResponse(
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param incidentCommentId Incident comment ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
-    Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId, Context context);
+    void delete(String resourceGroupName, String workspaceName, String incidentId, String incidentCommentId);
 
     /**
      * Gets an incident comment.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentConfiguration.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentConfiguration.java
index 3746be98a60a..74a866d473bd 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentConfiguration.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentConfiguration.java
@@ -22,6 +22,10 @@ public final class IncidentConfiguration {
     @JsonProperty(value = "groupingConfiguration")
     private GroupingConfiguration groupingConfiguration;
 
+    /** Creates an instance of IncidentConfiguration class. */
+    public IncidentConfiguration() {
+    }
+
     /**
      * Get the createIncident property: Create incidents from alerts triggered by this analytics rule.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentEntitiesResultsMetadata.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentEntitiesResultsMetadata.java
index f282c15e2c9d..c785349e0fef 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentEntitiesResultsMetadata.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentEntitiesResultsMetadata.java
@@ -23,6 +23,10 @@ public final class IncidentEntitiesResultsMetadata {
     @JsonProperty(value = "entityKind", required = true)
     private EntityKind entityKind;
 
+    /** Creates an instance of IncidentEntitiesResultsMetadata class. */
+    public IncidentEntitiesResultsMetadata() {
+    }
+
     /**
      * Get the count property: Total number of aggregations of the given kind in the incident related entities result.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentInfo.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentInfo.java
index e8ee0d18e29b..1dba99098061 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentInfo.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentInfo.java
@@ -34,6 +34,10 @@ public final class IncidentInfo {
     @JsonProperty(value = "relationName")
     private String relationName;
 
+    /** Creates an instance of IncidentInfo class. */
+    public IncidentInfo() {
+    }
+
     /**
      * Get the incidentId property: Incident Id.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentLabel.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentLabel.java
index c24c4a8522ea..975a88bd59ca 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentLabel.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentLabel.java
@@ -23,6 +23,10 @@ public final class IncidentLabel {
     @JsonProperty(value = "labelType", access = JsonProperty.Access.WRITE_ONLY)
     private IncidentLabelType labelType;
 
+    /** Creates an instance of IncidentLabel class. */
+    public IncidentLabel() {
+    }
+
     /**
      * Get the labelName property: The name of the label.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentList.java
index 11cec266205d..5d06bdc24468 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentList.java
@@ -25,6 +25,10 @@ public final class IncidentList {
     @JsonProperty(value = "value", required = true)
     private List<IncidentInner> value;
 
+    /** Creates an instance of IncidentList class. */
+    public IncidentList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of incidents.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentOwnerInfo.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentOwnerInfo.java
index dee86cc22860..32b1f5991cfe 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentOwnerInfo.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentOwnerInfo.java
@@ -41,6 +41,10 @@ public final class IncidentOwnerInfo {
     @JsonProperty(value = "ownerType")
     private OwnerType ownerType;
 
+    /** Creates an instance of IncidentOwnerInfo class. */
+    public IncidentOwnerInfo() {
+    }
+
     /**
      * Get the email property: The email of the user the incident is assigned to.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentPropertiesAction.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentPropertiesAction.java
index 0278075d0b46..7680e876e183 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentPropertiesAction.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentPropertiesAction.java
@@ -53,6 +53,10 @@ public final class IncidentPropertiesAction {
     @JsonProperty(value = "labels")
     private List<IncidentLabel> labels;
 
+    /** Creates an instance of IncidentPropertiesAction class. */
+    public IncidentPropertiesAction() {
+    }
+
     /**
      * Get the severity property: The severity of the incident.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentRelations.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentRelations.java
index 078c2fce6eb8..dbf09abdbe1b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentRelations.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IncidentRelations.java
@@ -52,20 +52,6 @@ PagedIterable<Relation> list(
         String skipToken,
         Context context);
 
-    /**
-     * Gets an incident relation.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param incidentId Incident ID.
-     * @param relationName Relation Name.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an incident relation.
-     */
-    Relation get(String resourceGroupName, String workspaceName, String incidentId, String relationName);
-
     /**
      * Gets an incident relation.
      *
@@ -83,20 +69,18 @@ Response<Relation> getWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, String relationName, Context context);
 
     /**
-     * Creates or updates the incident relation.
+     * Gets an incident relation.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param relationName Relation Name.
-     * @param relation The relation model.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return represents a relation between two resources.
+     * @return an incident relation.
      */
-    Relation createOrUpdate(
-        String resourceGroupName, String workspaceName, String incidentId, String relationName, RelationInner relation);
+    Relation get(String resourceGroupName, String workspaceName, String incidentId, String relationName);
 
     /**
      * Creates or updates the incident relation.
@@ -121,17 +105,20 @@ Response<Relation> createOrUpdateWithResponse(
         Context context);
 
     /**
-     * Delete the incident relation.
+     * Creates or updates the incident relation.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
      * @param relationName Relation Name.
+     * @param relation The relation model.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return represents a relation between two resources.
      */
-    void delete(String resourceGroupName, String workspaceName, String incidentId, String relationName);
+    Relation createOrUpdate(
+        String resourceGroupName, String workspaceName, String incidentId, String relationName, RelationInner relation);
 
     /**
      * Delete the incident relation.
@@ -148,4 +135,17 @@ Response<Relation> createOrUpdateWithResponse(
      */
     Response<Void> deleteWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, String relationName, Context context);
+
+    /**
+     * Delete the incident relation.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param incidentId Incident ID.
+     * @param relationName Relation Name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void delete(String resourceGroupName, String workspaceName, String incidentId, String relationName);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Incidents.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Incidents.java
index 3a2710c7cad6..8d19ce84bcc8 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Incidents.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Incidents.java
@@ -16,12 +16,19 @@ public interface Incidents {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentIdentifier The incidentIdentifier parameter.
+     * @param requestBody The requestBody parameter.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return any object.
+     * @return any object along with {@link Response}.
      */
-    Object runPlaybook(String resourceGroupName, String workspaceName, String incidentIdentifier);
+    Response<Object> runPlaybookWithResponse(
+        String resourceGroupName,
+        String workspaceName,
+        String incidentIdentifier,
+        ManualTriggerRequestBody requestBody,
+        Context context);
 
     /**
      * Triggers playbook on a specific incident.
@@ -29,19 +36,12 @@ public interface Incidents {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentIdentifier The incidentIdentifier parameter.
-     * @param requestBody The requestBody parameter.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return any object along with {@link Response}.
+     * @return any object.
      */
-    Response<Object> runPlaybookWithResponse(
-        String resourceGroupName,
-        String workspaceName,
-        String incidentIdentifier,
-        ManualTriggerRequestBody requestBody,
-        Context context);
+    Object runPlaybook(String resourceGroupName, String workspaceName, String incidentIdentifier);
 
     /**
      * Gets all incidents.
@@ -81,19 +81,6 @@ PagedIterable<Incident> list(
         String skipToken,
         Context context);
 
-    /**
-     * Gets an incident.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param incidentId Incident ID.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an incident.
-     */
-    Incident get(String resourceGroupName, String workspaceName, String incidentId);
-
     /**
      * Gets an incident.
      *
@@ -110,7 +97,7 @@ Response<Incident> getWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, Context context);
 
     /**
-     * Delete the incident.
+     * Gets an incident.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
@@ -118,8 +105,9 @@ Response<Incident> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return an incident.
      */
-    void delete(String resourceGroupName, String workspaceName, String incidentId);
+    Incident get(String resourceGroupName, String workspaceName, String incidentId);
 
     /**
      * Delete the incident.
@@ -137,19 +125,16 @@ Response<Void> deleteWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, Context context);
 
     /**
-     * Creates a Microsoft team to investigate the incident by sharing information and insights between participants.
+     * Delete the incident.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
-     * @param teamProperties Team properties.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes team information.
      */
-    TeamInformation createTeam(
-        String resourceGroupName, String workspaceName, String incidentId, TeamProperties teamProperties);
+    void delete(String resourceGroupName, String workspaceName, String incidentId);
 
     /**
      * Creates a Microsoft team to investigate the incident by sharing information and insights between participants.
@@ -172,17 +157,19 @@ Response<TeamInformation> createTeamWithResponse(
         Context context);
 
     /**
-     * Gets all incident alerts.
+     * Creates a Microsoft team to investigate the incident by sharing information and insights between participants.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param incidentId Incident ID.
+     * @param teamProperties Team properties.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all incident alerts.
+     * @return describes team information.
      */
-    IncidentAlertList listAlerts(String resourceGroupName, String workspaceName, String incidentId);
+    TeamInformation createTeam(
+        String resourceGroupName, String workspaceName, String incidentId, TeamProperties teamProperties);
 
     /**
      * Gets all incident alerts.
@@ -200,7 +187,7 @@ Response<IncidentAlertList> listAlertsWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, Context context);
 
     /**
-     * Gets all incident bookmarks.
+     * Gets all incident alerts.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
@@ -208,9 +195,9 @@ Response<IncidentAlertList> listAlertsWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all incident bookmarks.
+     * @return all incident alerts.
      */
-    IncidentBookmarkList listBookmarks(String resourceGroupName, String workspaceName, String incidentId);
+    IncidentAlertList listAlerts(String resourceGroupName, String workspaceName, String incidentId);
 
     /**
      * Gets all incident bookmarks.
@@ -228,7 +215,7 @@ Response<IncidentBookmarkList> listBookmarksWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, Context context);
 
     /**
-     * Gets all incident related entities.
+     * Gets all incident bookmarks.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
@@ -236,9 +223,9 @@ Response<IncidentBookmarkList> listBookmarksWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all incident related entities.
+     * @return all incident bookmarks.
      */
-    IncidentEntitiesResponse listEntities(String resourceGroupName, String workspaceName, String incidentId);
+    IncidentBookmarkList listBookmarks(String resourceGroupName, String workspaceName, String incidentId);
 
     /**
      * Gets all incident related entities.
@@ -255,6 +242,19 @@ Response<IncidentBookmarkList> listBookmarksWithResponse(
     Response<IncidentEntitiesResponse> listEntitiesWithResponse(
         String resourceGroupName, String workspaceName, String incidentId, Context context);
 
+    /**
+     * Gets all incident related entities.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param incidentId Incident ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return all incident related entities.
+     */
+    IncidentEntitiesResponse listEntities(String resourceGroupName, String workspaceName, String incidentId);
+
     /**
      * Gets an incident.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItem.java
index 0efb0bc5aff8..0d7b8b000392 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItem.java
@@ -20,6 +20,10 @@ public final class InsightQueryItem extends EntityQueryItem {
     @JsonProperty(value = "properties")
     private InsightQueryItemProperties properties;
 
+    /** Creates an instance of InsightQueryItem class. */
+    public InsightQueryItem() {
+    }
+
     /**
      * Get the properties property: Properties bag for InsightQueryItem.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemProperties.java
index e69737b5e3c8..67b3aac548b5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemProperties.java
@@ -59,6 +59,10 @@ public final class InsightQueryItemProperties extends EntityQueryItemProperties
     @JsonProperty(value = "referenceTimeRange")
     private InsightQueryItemPropertiesReferenceTimeRange referenceTimeRange;
 
+    /** Creates an instance of InsightQueryItemProperties class. */
+    public InsightQueryItemProperties() {
+    }
+
     /**
      * Get the displayName property: The insight display name.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesAdditionalQuery.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesAdditionalQuery.java
index c9877e7f9273..85469c4c7e6d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesAdditionalQuery.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesAdditionalQuery.java
@@ -22,6 +22,10 @@ public final class InsightQueryItemPropertiesAdditionalQuery {
     @JsonProperty(value = "text")
     private String text;
 
+    /** Creates an instance of InsightQueryItemPropertiesAdditionalQuery class. */
+    public InsightQueryItemPropertiesAdditionalQuery() {
+    }
+
     /**
      * Get the query property: The insight query.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesDefaultTimeRange.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesDefaultTimeRange.java
index f870634fb199..6ca5ad9714ee 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesDefaultTimeRange.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesDefaultTimeRange.java
@@ -22,6 +22,10 @@ public final class InsightQueryItemPropertiesDefaultTimeRange {
     @JsonProperty(value = "afterRange")
     private String afterRange;
 
+    /** Creates an instance of InsightQueryItemPropertiesDefaultTimeRange class. */
+    public InsightQueryItemPropertiesDefaultTimeRange() {
+    }
+
     /**
      * Get the beforeRange property: The padding for the start time of the query.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesReferenceTimeRange.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesReferenceTimeRange.java
index 6dd0b8e28f15..56b41fe1f373 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesReferenceTimeRange.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesReferenceTimeRange.java
@@ -16,6 +16,10 @@ public final class InsightQueryItemPropertiesReferenceTimeRange {
     @JsonProperty(value = "beforeRange")
     private String beforeRange;
 
+    /** Creates an instance of InsightQueryItemPropertiesReferenceTimeRange class. */
+    public InsightQueryItemPropertiesReferenceTimeRange() {
+    }
+
     /**
      * Get the beforeRange property: Additional query time for looking back.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesTableQuery.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesTableQuery.java
index 3c889abbed88..c6127abe667a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesTableQuery.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesTableQuery.java
@@ -23,6 +23,10 @@ public final class InsightQueryItemPropertiesTableQuery {
     @JsonProperty(value = "queriesDefinitions")
     private List<InsightQueryItemPropertiesTableQueryQueriesDefinitionsItem> queriesDefinitions;
 
+    /** Creates an instance of InsightQueryItemPropertiesTableQuery class. */
+    public InsightQueryItemPropertiesTableQuery() {
+    }
+
     /**
      * Get the columnsDefinitions property: List of insight column definitions.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesTableQueryColumnsDefinitionsItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesTableQueryColumnsDefinitionsItem.java
index f9428faa609a..fded6773e09b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesTableQueryColumnsDefinitionsItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesTableQueryColumnsDefinitionsItem.java
@@ -28,6 +28,10 @@ public final class InsightQueryItemPropertiesTableQueryColumnsDefinitionsItem {
     @JsonProperty(value = "supportDeepLink")
     private Boolean supportDeepLink;
 
+    /** Creates an instance of InsightQueryItemPropertiesTableQueryColumnsDefinitionsItem class. */
+    public InsightQueryItemPropertiesTableQueryColumnsDefinitionsItem() {
+    }
+
     /**
      * Get the headerProperty property: Insight column header.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesTableQueryQueriesDefinitionsItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesTableQueryQueriesDefinitionsItem.java
index ea811b7bdc9a..ed768336113e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesTableQueryQueriesDefinitionsItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesTableQueryQueriesDefinitionsItem.java
@@ -35,6 +35,10 @@ public final class InsightQueryItemPropertiesTableQueryQueriesDefinitionsItem {
     @JsonProperty(value = "linkColumnsDefinitions")
     private List<InsightQueryItemPropertiesTableQueryQueriesDefinitionsPropertiesItemsItem> linkColumnsDefinitions;
 
+    /** Creates an instance of InsightQueryItemPropertiesTableQueryQueriesDefinitionsItem class. */
+    public InsightQueryItemPropertiesTableQueryQueriesDefinitionsItem() {
+    }
+
     /**
      * Get the filter property: Insight column header.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesTableQueryQueriesDefinitionsPropertiesItemsItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesTableQueryQueriesDefinitionsPropertiesItemsItem.java
index 626304571d5c..aefca4653d86 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesTableQueryQueriesDefinitionsPropertiesItemsItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightQueryItemPropertiesTableQueryQueriesDefinitionsPropertiesItemsItem.java
@@ -22,6 +22,10 @@ public final class InsightQueryItemPropertiesTableQueryQueriesDefinitionsPropert
     @JsonProperty(value = "Query")
     private String query;
 
+    /** Creates an instance of InsightQueryItemPropertiesTableQueryQueriesDefinitionsPropertiesItemsItem class. */
+    public InsightQueryItemPropertiesTableQueryQueriesDefinitionsPropertiesItemsItem() {
+    }
+
     /**
      * Get the projectedName property: Insight Link Definition Projected Name.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightsTableResult.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightsTableResult.java
index 08c5f7cb09c2..18e8969e4cc1 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightsTableResult.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightsTableResult.java
@@ -23,6 +23,10 @@ public final class InsightsTableResult {
     @JsonProperty(value = "rows")
     private List<List<String>> rows;
 
+    /** Creates an instance of InsightsTableResult class. */
+    public InsightsTableResult() {
+    }
+
     /**
      * Get the columns property: Columns Metadata of the table.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightsTableResultColumnsItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightsTableResultColumnsItem.java
index 486e7914039c..cf1bd2dc1972 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightsTableResultColumnsItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InsightsTableResultColumnsItem.java
@@ -22,6 +22,10 @@ public final class InsightsTableResultColumnsItem {
     @JsonProperty(value = "name")
     private String name;
 
+    /** Creates an instance of InsightsTableResultColumnsItem class. */
+    public InsightsTableResultColumnsItem() {
+    }
+
     /**
      * Get the type property: the type of the colum.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InstructionSteps.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InstructionSteps.java
index 227c38863a55..de9e6b7b83fe 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InstructionSteps.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InstructionSteps.java
@@ -29,6 +29,10 @@ public class InstructionSteps {
     @JsonProperty(value = "instructions")
     private List<InstructionStepsInstructionsItem> instructions;
 
+    /** Creates an instance of InstructionSteps class. */
+    public InstructionSteps() {
+    }
+
     /**
      * Get the title property: Instruction step title.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InstructionStepsInstructionsItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InstructionStepsInstructionsItem.java
index 45cf764a6a76..b30b0a0b303a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InstructionStepsInstructionsItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/InstructionStepsInstructionsItem.java
@@ -9,6 +9,10 @@
 /** The InstructionStepsInstructionsItem model. */
 @Fluent
 public final class InstructionStepsInstructionsItem extends ConnectorInstructionModelBase {
+    /** Creates an instance of InstructionStepsInstructionsItem class. */
+    public InstructionStepsInstructionsItem() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public InstructionStepsInstructionsItem withParameters(Object parameters) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IoTCheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IoTCheckRequirements.java
index cf5ebc9db245..f1cfd8df136c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IoTCheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IoTCheckRequirements.java
@@ -21,6 +21,10 @@ public final class IoTCheckRequirements extends DataConnectorsCheckRequirements
     @JsonProperty(value = "properties")
     private IoTCheckRequirementsProperties innerProperties;
 
+    /** Creates an instance of IoTCheckRequirements class. */
+    public IoTCheckRequirements() {
+    }
+
     /**
      * Get the innerProperties property: IoT requirements check properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IoTDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IoTDataConnector.java
index 787fff5098c3..4e04dc30decd 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IoTDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IoTDataConnector.java
@@ -22,6 +22,10 @@ public final class IoTDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private IoTDataConnectorProperties innerProperties;
 
+    /** Creates an instance of IoTDataConnector class. */
+    public IoTDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: IoT data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IoTDeviceEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IoTDeviceEntity.java
index 06ab4d1c051d..b2251a5ea8be 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IoTDeviceEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IoTDeviceEntity.java
@@ -25,6 +25,10 @@ public final class IoTDeviceEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private IoTDeviceEntityProperties innerProperties;
 
+    /** Creates an instance of IoTDeviceEntity class. */
+    public IoTDeviceEntity() {
+    }
+
     /**
      * Get the innerProperties property: IoTDevice entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IpEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IpEntity.java
index beeac5a11a60..f0ec73678065 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IpEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IpEntity.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityInner;
 import com.azure.resourcemanager.securityinsights.fluent.models.IpEntityProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -16,7 +16,7 @@
 /** Represents an ip entity. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("Ip")
-@Fluent
+@Immutable
 public final class IpEntity extends EntityInner {
     /*
      * Ip entity properties
@@ -24,6 +24,10 @@ public final class IpEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private IpEntityProperties innerProperties;
 
+    /** Creates an instance of IpEntity class. */
+    public IpEntity() {
+    }
+
     /**
      * Get the innerProperties property: Ip entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IpGeodatas.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IpGeodatas.java
index c85e9c1ab375..818b8e284d64 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IpGeodatas.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/IpGeodatas.java
@@ -14,23 +14,23 @@ public interface IpGeodatas {
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param ipAddress IP address (v4 or v6) to be enriched.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return geodata for a single IP address.
+     * @return geodata for a single IP address along with {@link Response}.
      */
-    EnrichmentIpGeodata get(String resourceGroupName, String ipAddress);
+    Response<EnrichmentIpGeodata> getWithResponse(String resourceGroupName, String ipAddress, Context context);
 
     /**
      * Get geodata for a single IP address.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param ipAddress IP address (v4 or v6) to be enriched.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return geodata for a single IP address along with {@link Response}.
+     * @return geodata for a single IP address.
      */
-    Response<EnrichmentIpGeodata> getWithResponse(String resourceGroupName, String ipAddress, Context context);
+    EnrichmentIpGeodata get(String resourceGroupName, String ipAddress);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/KillChainIntent.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/KillChainIntent.java
index ff0016d01c52..2767fd43f139 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/KillChainIntent.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/KillChainIntent.java
@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import java.util.Collection;
 
-/** Holds the alert intent stage(s) mapping for this alert. */
+/** The intent of the alert. */
 public final class KillChainIntent extends ExpandableStringEnum<KillChainIntent> {
     /** Static value Unknown for KillChainIntent. */
     public static final KillChainIntent UNKNOWN = fromString("Unknown");
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/LastDataReceivedDataType.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/LastDataReceivedDataType.java
index ee71cb19cfb9..eacd6e8811c1 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/LastDataReceivedDataType.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/LastDataReceivedDataType.java
@@ -22,6 +22,10 @@ public class LastDataReceivedDataType {
     @JsonProperty(value = "lastDataReceivedQuery")
     private String lastDataReceivedQuery;
 
+    /** Creates an instance of LastDataReceivedDataType class. */
+    public LastDataReceivedDataType() {
+    }
+
     /**
      * Get the name property: Name of the data type to show in the graph. can be use with {{graphQueriesTableName}}
      * placeholder.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MLBehaviorAnalyticsAlertRule.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MLBehaviorAnalyticsAlertRule.java
index 9538371ea2c4..c41d1e9677dc 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MLBehaviorAnalyticsAlertRule.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MLBehaviorAnalyticsAlertRule.java
@@ -24,6 +24,10 @@ public final class MLBehaviorAnalyticsAlertRule extends AlertRuleInner {
     @JsonProperty(value = "properties")
     private MLBehaviorAnalyticsAlertRuleProperties innerProperties;
 
+    /** Creates an instance of MLBehaviorAnalyticsAlertRule class. */
+    public MLBehaviorAnalyticsAlertRule() {
+    }
+
     /**
      * Get the innerProperties property: MLBehaviorAnalytics alert rule properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MLBehaviorAnalyticsAlertRuleTemplate.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MLBehaviorAnalyticsAlertRuleTemplate.java
index 3dc6cb43070c..7ff8a9aae142 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MLBehaviorAnalyticsAlertRuleTemplate.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MLBehaviorAnalyticsAlertRuleTemplate.java
@@ -24,6 +24,10 @@ public final class MLBehaviorAnalyticsAlertRuleTemplate extends AlertRuleTemplat
     @JsonProperty(value = "properties")
     private MLBehaviorAnalyticsAlertRuleTemplateProperties innerProperties;
 
+    /** Creates an instance of MLBehaviorAnalyticsAlertRuleTemplate class. */
+    public MLBehaviorAnalyticsAlertRuleTemplate() {
+    }
+
     /**
      * Get the innerProperties property: MLBehaviorAnalytics alert rule template properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MailClusterEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MailClusterEntity.java
index 1f8aeca643cc..8107f98359e9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MailClusterEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MailClusterEntity.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityInner;
 import com.azure.resourcemanager.securityinsights.fluent.models.MailClusterEntityProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -17,7 +17,7 @@
 /** Represents a mail cluster entity. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("MailCluster")
-@Fluent
+@Immutable
 public final class MailClusterEntity extends EntityInner {
     /*
      * Mail cluster entity properties
@@ -25,6 +25,10 @@ public final class MailClusterEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private MailClusterEntityProperties innerProperties;
 
+    /** Creates an instance of MailClusterEntity class. */
+    public MailClusterEntity() {
+    }
+
     /**
      * Get the innerProperties property: Mail cluster entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MailMessageEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MailMessageEntity.java
index 8d4c01ef2b89..ebd61789c75c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MailMessageEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MailMessageEntity.java
@@ -26,6 +26,10 @@ public final class MailMessageEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private MailMessageEntityProperties innerProperties;
 
+    /** Creates an instance of MailMessageEntity class. */
+    public MailMessageEntity() {
+    }
+
     /**
      * Get the innerProperties property: Mail message entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MailboxEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MailboxEntity.java
index 9441ac626ef0..550d3d54eff7 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MailboxEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MailboxEntity.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityInner;
 import com.azure.resourcemanager.securityinsights.fluent.models.MailboxEntityProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -16,7 +16,7 @@
 /** Represents a mailbox entity. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("Mailbox")
-@Fluent
+@Immutable
 public final class MailboxEntity extends EntityInner {
     /*
      * Mailbox entity properties
@@ -24,6 +24,10 @@ public final class MailboxEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private MailboxEntityProperties innerProperties;
 
+    /** Creates an instance of MailboxEntity class. */
+    public MailboxEntity() {
+    }
+
     /**
      * Get the innerProperties property: Mailbox entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MalwareEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MalwareEntity.java
index efcd2bbb952b..906b04dc6e98 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MalwareEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MalwareEntity.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityInner;
 import com.azure.resourcemanager.securityinsights.fluent.models.MalwareEntityProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -16,7 +16,7 @@
 /** Represents a malware entity. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("Malware")
-@Fluent
+@Immutable
 public final class MalwareEntity extends EntityInner {
     /*
      * File entity properties
@@ -24,6 +24,10 @@ public final class MalwareEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private MalwareEntityProperties innerProperties;
 
+    /** Creates an instance of MalwareEntity class. */
+    public MalwareEntity() {
+    }
+
     /**
      * Get the innerProperties property: File entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ManualTriggerRequestBody.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ManualTriggerRequestBody.java
index ab2433df85a5..1491f62fd9aa 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ManualTriggerRequestBody.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ManualTriggerRequestBody.java
@@ -24,6 +24,10 @@ public final class ManualTriggerRequestBody {
     @JsonProperty(value = "logicAppsResourceId", required = true)
     private String logicAppsResourceId;
 
+    /** Creates an instance of ManualTriggerRequestBody class. */
+    public ManualTriggerRequestBody() {
+    }
+
     /**
      * Get the tenantId property: The tenantId property.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/McasCheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/McasCheckRequirements.java
index bf543c75aaaf..729d443fb07e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/McasCheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/McasCheckRequirements.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.McasCheckRequirementsProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -13,7 +13,7 @@
 /** Represents MCAS (Microsoft Cloud App Security) requirements check request. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("MicrosoftCloudAppSecurity")
-@Fluent
+@Immutable
 public final class McasCheckRequirements extends DataConnectorsCheckRequirements {
     /*
      * MCAS (Microsoft Cloud App Security) requirements check properties.
@@ -21,6 +21,10 @@ public final class McasCheckRequirements extends DataConnectorsCheckRequirements
     @JsonProperty(value = "properties")
     private McasCheckRequirementsProperties innerProperties;
 
+    /** Creates an instance of McasCheckRequirements class. */
+    public McasCheckRequirements() {
+    }
+
     /**
      * Get the innerProperties property: MCAS (Microsoft Cloud App Security) requirements check properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/McasDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/McasDataConnector.java
index 4849da973db9..b97aa53d6e97 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/McasDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/McasDataConnector.java
@@ -22,6 +22,10 @@ public final class McasDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private McasDataConnectorProperties innerProperties;
 
+    /** Creates an instance of McasDataConnector class. */
+    public McasDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: MCAS (Microsoft Cloud App Security) data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/McasDataConnectorDataTypes.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/McasDataConnectorDataTypes.java
index ced242cf519f..47e45201f9aa 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/McasDataConnectorDataTypes.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/McasDataConnectorDataTypes.java
@@ -16,6 +16,10 @@ public final class McasDataConnectorDataTypes extends AlertsDataTypeOfDataConnec
     @JsonProperty(value = "discoveryLogs")
     private DataConnectorDataTypeCommon discoveryLogs;
 
+    /** Creates an instance of McasDataConnectorDataTypes class. */
+    public McasDataConnectorDataTypes() {
+    }
+
     /**
      * Get the discoveryLogs property: Discovery log data type connection.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MdatpCheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MdatpCheckRequirements.java
index 97b1be834a33..aa29ce56de1c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MdatpCheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MdatpCheckRequirements.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.MdatpCheckRequirementsProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -13,7 +13,7 @@
 /** Represents MDATP (Microsoft Defender Advanced Threat Protection) requirements check request. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("MicrosoftDefenderAdvancedThreatProtection")
-@Fluent
+@Immutable
 public final class MdatpCheckRequirements extends DataConnectorsCheckRequirements {
     /*
      * MDATP (Microsoft Defender Advanced Threat Protection) requirements check properties.
@@ -21,6 +21,10 @@ public final class MdatpCheckRequirements extends DataConnectorsCheckRequirement
     @JsonProperty(value = "properties")
     private MdatpCheckRequirementsProperties innerProperties;
 
+    /** Creates an instance of MdatpCheckRequirements class. */
+    public MdatpCheckRequirements() {
+    }
+
     /**
      * Get the innerProperties property: MDATP (Microsoft Defender Advanced Threat Protection) requirements check
      * properties.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MdatpDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MdatpDataConnector.java
index be4c5abc500b..6091da72918b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MdatpDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MdatpDataConnector.java
@@ -22,6 +22,10 @@ public final class MdatpDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private MdatpDataConnectorProperties innerProperties;
 
+    /** Creates an instance of MdatpDataConnector class. */
+    public MdatpDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: MDATP (Microsoft Defender Advanced Threat Protection) data connector
      * properties.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataAuthor.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataAuthor.java
index 568297b27c57..8c6d3e99ebc0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataAuthor.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataAuthor.java
@@ -28,6 +28,10 @@ public final class MetadataAuthor {
     @JsonProperty(value = "link")
     private String link;
 
+    /** Creates an instance of MetadataAuthor class. */
+    public MetadataAuthor() {
+    }
+
     /**
      * Get the name property: Name of the author. Company or person.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataCategories.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataCategories.java
index d2101c1cc1cf..2a244bb3737d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataCategories.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataCategories.java
@@ -23,6 +23,10 @@ public final class MetadataCategories {
     @JsonProperty(value = "verticals")
     private List<String> verticals;
 
+    /** Creates an instance of MetadataCategories class. */
+    public MetadataCategories() {
+    }
+
     /**
      * Get the domains property: domain for the solution content item.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataDependencies.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataDependencies.java
index 0fcabe6da5cd..755994119456 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataDependencies.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataDependencies.java
@@ -52,6 +52,10 @@ public final class MetadataDependencies {
     @JsonProperty(value = "criteria")
     private List<MetadataDependencies> criteria;
 
+    /** Creates an instance of MetadataDependencies class. */
+    public MetadataDependencies() {
+    }
+
     /**
      * Get the contentId property: Id of the content item we depend on.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataList.java
index a5a93f7aa39f..138ea7030250 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataList.java
@@ -25,6 +25,10 @@ public final class MetadataList {
     @JsonProperty(value = "nextLink", access = JsonProperty.Access.WRITE_ONLY)
     private String nextLink;
 
+    /** Creates an instance of MetadataList class. */
+    public MetadataList() {
+    }
+
     /**
      * Get the value property: Array of metadata.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataPatch.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataPatch.java
index 7556f02585fb..96b649e7e87a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataPatch.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataPatch.java
@@ -19,6 +19,10 @@ public final class MetadataPatch extends ResourceWithEtag {
     @JsonProperty(value = "properties")
     private MetadataPropertiesPatch innerProperties;
 
+    /** Creates an instance of MetadataPatch class. */
+    public MetadataPatch() {
+    }
+
     /**
      * Get the innerProperties property: Metadata patch request body.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataSource.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataSource.java
index 41a206a6dccf..8c21deca2e75 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataSource.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataSource.java
@@ -29,6 +29,10 @@ public final class MetadataSource {
     @JsonProperty(value = "sourceId")
     private String sourceId;
 
+    /** Creates an instance of MetadataSource class. */
+    public MetadataSource() {
+    }
+
     /**
      * Get the kind property: Source type of the content.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataSupport.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataSupport.java
index a25d51b568be..a2d9a01d2b2d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataSupport.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MetadataSupport.java
@@ -35,6 +35,10 @@ public final class MetadataSupport {
     @JsonProperty(value = "link")
     private String link;
 
+    /** Creates an instance of MetadataSupport class. */
+    public MetadataSupport() {
+    }
+
     /**
      * Get the tier property: Type of support for content item.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Metadatas.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Metadatas.java
index b8be150a2a19..5640a663d54e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Metadatas.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Metadatas.java
@@ -53,12 +53,14 @@ PagedIterable<MetadataModel> list(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param metadataName The Metadata name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a Metadata.
+     * @return a Metadata along with {@link Response}.
      */
-    MetadataModel get(String resourceGroupName, String workspaceName, String metadataName);
+    Response<MetadataModel> getWithResponse(
+        String resourceGroupName, String workspaceName, String metadataName, Context context);
 
     /**
      * Get a Metadata.
@@ -66,14 +68,12 @@ PagedIterable<MetadataModel> list(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param metadataName The Metadata name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a Metadata along with {@link Response}.
+     * @return a Metadata.
      */
-    Response<MetadataModel> getWithResponse(
-        String resourceGroupName, String workspaceName, String metadataName, Context context);
+    MetadataModel get(String resourceGroupName, String workspaceName, String metadataName);
 
     /**
      * Delete a Metadata.
@@ -81,11 +81,14 @@ Response<MetadataModel> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param metadataName The Metadata name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
-    void delete(String resourceGroupName, String workspaceName, String metadataName);
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String metadataName, Context context);
 
     /**
      * Delete a Metadata.
@@ -93,14 +96,11 @@ Response<MetadataModel> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param metadataName The Metadata name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
-    Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String metadataName, Context context);
+    void delete(String resourceGroupName, String workspaceName, String metadataName);
 
     /**
      * Get a Metadata.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MicrosoftSecurityIncidentCreationAlertRule.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MicrosoftSecurityIncidentCreationAlertRule.java
index 201a74e0f4e1..d72927a47966 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MicrosoftSecurityIncidentCreationAlertRule.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MicrosoftSecurityIncidentCreationAlertRule.java
@@ -24,6 +24,10 @@ public final class MicrosoftSecurityIncidentCreationAlertRule extends AlertRuleI
     @JsonProperty(value = "properties")
     private MicrosoftSecurityIncidentCreationAlertRuleProperties innerProperties;
 
+    /** Creates an instance of MicrosoftSecurityIncidentCreationAlertRule class. */
+    public MicrosoftSecurityIncidentCreationAlertRule() {
+    }
+
     /**
      * Get the innerProperties property: MicrosoftSecurityIncidentCreation rule properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MicrosoftSecurityIncidentCreationAlertRuleCommonProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MicrosoftSecurityIncidentCreationAlertRuleCommonProperties.java
index 5a6e176fc2a3..d76b0b58863b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MicrosoftSecurityIncidentCreationAlertRuleCommonProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MicrosoftSecurityIncidentCreationAlertRuleCommonProperties.java
@@ -36,6 +36,10 @@ public class MicrosoftSecurityIncidentCreationAlertRuleCommonProperties {
     @JsonProperty(value = "severitiesFilter")
     private List<AlertSeverity> severitiesFilter;
 
+    /** Creates an instance of MicrosoftSecurityIncidentCreationAlertRuleCommonProperties class. */
+    public MicrosoftSecurityIncidentCreationAlertRuleCommonProperties() {
+    }
+
     /**
      * Get the displayNamesFilter property: the alerts' displayNames on which the cases will be generated.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MicrosoftSecurityIncidentCreationAlertRuleTemplate.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MicrosoftSecurityIncidentCreationAlertRuleTemplate.java
index d908982016d7..356b3a7e049b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MicrosoftSecurityIncidentCreationAlertRuleTemplate.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MicrosoftSecurityIncidentCreationAlertRuleTemplate.java
@@ -24,6 +24,10 @@ public final class MicrosoftSecurityIncidentCreationAlertRuleTemplate extends Al
     @JsonProperty(value = "properties")
     private MicrosoftSecurityIncidentCreationAlertRuleTemplateProperties innerProperties;
 
+    /** Creates an instance of MicrosoftSecurityIncidentCreationAlertRuleTemplate class. */
+    public MicrosoftSecurityIncidentCreationAlertRuleTemplate() {
+    }
+
     /**
      * Get the innerProperties property: MicrosoftSecurityIncidentCreation rule template properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Mode.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Mode.java
new file mode 100644
index 000000000000..8f28c7a377cd
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Mode.java
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.util.Collection;
+
+/** The current mode of the workspace manager configuration. */
+public final class Mode extends ExpandableStringEnum<Mode> {
+    /** Static value Enabled for Mode. */
+    public static final Mode ENABLED = fromString("Enabled");
+
+    /** Static value Disabled for Mode. */
+    public static final Mode DISABLED = fromString("Disabled");
+
+    /**
+     * Creates or finds a Mode from its string representation.
+     *
+     * @param name a name to look for.
+     * @return the corresponding Mode.
+     */
+    @JsonCreator
+    public static Mode fromString(String name) {
+        return fromString(name, Mode.class);
+    }
+
+    /**
+     * Gets known Mode values.
+     *
+     * @return known Mode values.
+     */
+    public static Collection<Mode> values() {
+        return values(Mode.class);
+    }
+}
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiCheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiCheckRequirements.java
index 95cb0a532898..2a4e7f486dc3 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiCheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiCheckRequirements.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.MstiCheckRequirementsProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -13,7 +13,7 @@
 /** Represents Microsoft Threat Intelligence requirements check request. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("MicrosoftThreatIntelligence")
-@Fluent
+@Immutable
 public final class MstiCheckRequirements extends DataConnectorsCheckRequirements {
     /*
      * Microsoft Threat Intelligence requirements check properties.
@@ -21,6 +21,10 @@ public final class MstiCheckRequirements extends DataConnectorsCheckRequirements
     @JsonProperty(value = "properties")
     private MstiCheckRequirementsProperties innerProperties;
 
+    /** Creates an instance of MstiCheckRequirements class. */
+    public MstiCheckRequirements() {
+    }
+
     /**
      * Get the innerProperties property: Microsoft Threat Intelligence requirements check properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiDataConnector.java
index 55c79f1bebab..16b1379dbb50 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiDataConnector.java
@@ -22,6 +22,10 @@ public final class MstiDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private MstiDataConnectorProperties innerProperties;
 
+    /** Creates an instance of MstiDataConnector class. */
+    public MstiDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: Microsoft Threat Intelligence data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiDataConnectorDataTypes.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiDataConnectorDataTypes.java
index 2c1077694cfd..017c3f55f26d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiDataConnectorDataTypes.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiDataConnectorDataTypes.java
@@ -23,6 +23,10 @@ public final class MstiDataConnectorDataTypes {
     @JsonProperty(value = "microsoftEmergingThreatFeed", required = true)
     private MstiDataConnectorDataTypesMicrosoftEmergingThreatFeed microsoftEmergingThreatFeed;
 
+    /** Creates an instance of MstiDataConnectorDataTypes class. */
+    public MstiDataConnectorDataTypes() {
+    }
+
     /**
      * Get the bingSafetyPhishingUrl property: Data type for Microsoft Threat Intelligence Platforms data connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiDataConnectorDataTypesBingSafetyPhishingUrl.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiDataConnectorDataTypesBingSafetyPhishingUrl.java
index 3eee77b51ac3..900c200b438e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiDataConnectorDataTypesBingSafetyPhishingUrl.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiDataConnectorDataTypesBingSafetyPhishingUrl.java
@@ -17,6 +17,10 @@ public final class MstiDataConnectorDataTypesBingSafetyPhishingUrl extends DataC
     @JsonProperty(value = "lookbackPeriod", required = true)
     private String lookbackPeriod;
 
+    /** Creates an instance of MstiDataConnectorDataTypesBingSafetyPhishingUrl class. */
+    public MstiDataConnectorDataTypesBingSafetyPhishingUrl() {
+    }
+
     /**
      * Get the lookbackPeriod property: lookback period.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiDataConnectorDataTypesMicrosoftEmergingThreatFeed.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiDataConnectorDataTypesMicrosoftEmergingThreatFeed.java
index 29ab116cee8f..518c325871d4 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiDataConnectorDataTypesMicrosoftEmergingThreatFeed.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MstiDataConnectorDataTypesMicrosoftEmergingThreatFeed.java
@@ -17,6 +17,10 @@ public final class MstiDataConnectorDataTypesMicrosoftEmergingThreatFeed extends
     @JsonProperty(value = "lookbackPeriod", required = true)
     private String lookbackPeriod;
 
+    /** Creates an instance of MstiDataConnectorDataTypesMicrosoftEmergingThreatFeed class. */
+    public MstiDataConnectorDataTypesMicrosoftEmergingThreatFeed() {
+    }
+
     /**
      * Get the lookbackPeriod property: lookback period.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MtpCheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MtpCheckRequirements.java
index 074527921be7..4e55a5c298ad 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MtpCheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MtpCheckRequirements.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.MtpCheckRequirementsProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -13,7 +13,7 @@
 /** Represents MTP (Microsoft Threat Protection) requirements check request. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("MicrosoftThreatProtection")
-@Fluent
+@Immutable
 public final class MtpCheckRequirements extends DataConnectorsCheckRequirements {
     /*
      * MTP (Microsoft Threat Protection) requirements check properties.
@@ -21,6 +21,10 @@ public final class MtpCheckRequirements extends DataConnectorsCheckRequirements
     @JsonProperty(value = "properties")
     private MtpCheckRequirementsProperties innerProperties;
 
+    /** Creates an instance of MtpCheckRequirements class. */
+    public MtpCheckRequirements() {
+    }
+
     /**
      * Get the innerProperties property: MTP (Microsoft Threat Protection) requirements check properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MtpDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MtpDataConnector.java
index 8c6b30014f43..78b9a7a48ea7 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MtpDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MtpDataConnector.java
@@ -22,6 +22,10 @@ public final class MtpDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private MtpDataConnectorProperties innerProperties;
 
+    /** Creates an instance of MtpDataConnector class. */
+    public MtpDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: MTP (Microsoft Threat Protection) data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MtpDataConnectorDataTypes.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MtpDataConnectorDataTypes.java
index 27fa2a5c2d9b..40ac54389b1e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MtpDataConnectorDataTypes.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MtpDataConnectorDataTypes.java
@@ -17,6 +17,10 @@ public final class MtpDataConnectorDataTypes {
     @JsonProperty(value = "incidents", required = true)
     private MtpDataConnectorDataTypesIncidents incidents;
 
+    /** Creates an instance of MtpDataConnectorDataTypes class. */
+    public MtpDataConnectorDataTypes() {
+    }
+
     /**
      * Get the incidents property: Data type for Microsoft Threat Protection Platforms data connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MtpDataConnectorDataTypesIncidents.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MtpDataConnectorDataTypesIncidents.java
index 0b347d9db7b6..37fcc27607eb 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MtpDataConnectorDataTypesIncidents.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MtpDataConnectorDataTypesIncidents.java
@@ -9,6 +9,10 @@
 /** Data type for Microsoft Threat Protection Platforms data connector. */
 @Fluent
 public final class MtpDataConnectorDataTypesIncidents extends DataConnectorDataTypeCommon {
+    /** Creates an instance of MtpDataConnectorDataTypesIncidents class. */
+    public MtpDataConnectorDataTypesIncidents() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public MtpDataConnectorDataTypesIncidents withState(DataTypeState state) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/NicEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/NicEntity.java
index 26326e8ddb92..8ff8953f2d42 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/NicEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/NicEntity.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityInner;
 import com.azure.resourcemanager.securityinsights.fluent.models.NicEntityProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -16,7 +16,7 @@
 /** Represents an network interface entity. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("Nic")
-@Fluent
+@Immutable
 public final class NicEntity extends EntityInner {
     /*
      * Network interface entity properties
@@ -24,6 +24,10 @@ public final class NicEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private NicEntityProperties innerProperties;
 
+    /** Creates an instance of NicEntity class. */
+    public NicEntity() {
+    }
+
     /**
      * Get the innerProperties property: Network interface entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/NrtAlertRule.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/NrtAlertRule.java
index 7a23f7a2b182..0ce0d60900d3 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/NrtAlertRule.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/NrtAlertRule.java
@@ -26,6 +26,10 @@ public final class NrtAlertRule extends AlertRuleInner {
     @JsonProperty(value = "properties")
     private NrtAlertRuleProperties innerProperties;
 
+    /** Creates an instance of NrtAlertRule class. */
+    public NrtAlertRule() {
+    }
+
     /**
      * Get the innerProperties property: NRT alert rule properties.
      *
@@ -427,6 +431,29 @@ public NrtAlertRule withEventGroupingSettings(EventGroupingSettings eventGroupin
         return this;
     }
 
+    /**
+     * Get the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @return the sentinelEntitiesMappings value.
+     */
+    public List<SentinelEntityMapping> sentinelEntitiesMappings() {
+        return this.innerProperties() == null ? null : this.innerProperties().sentinelEntitiesMappings();
+    }
+
+    /**
+     * Set the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @param sentinelEntitiesMappings the sentinelEntitiesMappings value to set.
+     * @return the NrtAlertRule object itself.
+     */
+    public NrtAlertRule withSentinelEntitiesMappings(List<SentinelEntityMapping> sentinelEntitiesMappings) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new NrtAlertRuleProperties();
+        }
+        this.innerProperties().withSentinelEntitiesMappings(sentinelEntitiesMappings);
+        return this;
+    }
+
     /**
      * Validates the instance.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/NrtAlertRuleTemplate.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/NrtAlertRuleTemplate.java
index 551cb9589235..d28b91f789e5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/NrtAlertRuleTemplate.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/NrtAlertRuleTemplate.java
@@ -25,6 +25,10 @@ public final class NrtAlertRuleTemplate extends AlertRuleTemplateInner {
     @JsonProperty(value = "properties")
     private NrtAlertRuleTemplateProperties innerProperties;
 
+    /** Creates an instance of NrtAlertRuleTemplate class. */
+    public NrtAlertRuleTemplate() {
+    }
+
     /**
      * Get the innerProperties property: NRT alert rule template properties.
      *
@@ -197,6 +201,29 @@ public NrtAlertRuleTemplate withEventGroupingSettings(EventGroupingSettings even
         return this;
     }
 
+    /**
+     * Get the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @return the sentinelEntitiesMappings value.
+     */
+    public List<SentinelEntityMapping> sentinelEntitiesMappings() {
+        return this.innerProperties() == null ? null : this.innerProperties().sentinelEntitiesMappings();
+    }
+
+    /**
+     * Set the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @param sentinelEntitiesMappings the sentinelEntitiesMappings value to set.
+     * @return the NrtAlertRuleTemplate object itself.
+     */
+    public NrtAlertRuleTemplate withSentinelEntitiesMappings(List<SentinelEntityMapping> sentinelEntitiesMappings) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new NrtAlertRuleTemplateProperties();
+        }
+        this.innerProperties().withSentinelEntitiesMappings(sentinelEntitiesMappings);
+        return this;
+    }
+
     /**
      * Get the tactics property: The tactics of the alert rule.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Office365ProjectCheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Office365ProjectCheckRequirements.java
index 8ed7cfef085e..1d6bf225765f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Office365ProjectCheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Office365ProjectCheckRequirements.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.Office365ProjectCheckRequirementsProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -13,7 +13,7 @@
 /** Represents Office365 Project requirements check request. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("Office365Project")
-@Fluent
+@Immutable
 public final class Office365ProjectCheckRequirements extends DataConnectorsCheckRequirements {
     /*
      * Office365 Project requirements check properties.
@@ -21,6 +21,10 @@ public final class Office365ProjectCheckRequirements extends DataConnectorsCheck
     @JsonProperty(value = "properties")
     private Office365ProjectCheckRequirementsProperties innerProperties;
 
+    /** Creates an instance of Office365ProjectCheckRequirements class. */
+    public Office365ProjectCheckRequirements() {
+    }
+
     /**
      * Get the innerProperties property: Office365 Project requirements check properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Office365ProjectConnectorDataTypes.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Office365ProjectConnectorDataTypes.java
index bafc9102b1dd..b709b2e023c4 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Office365ProjectConnectorDataTypes.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Office365ProjectConnectorDataTypes.java
@@ -17,6 +17,10 @@ public final class Office365ProjectConnectorDataTypes {
     @JsonProperty(value = "logs", required = true)
     private Office365ProjectConnectorDataTypesLogs logs;
 
+    /** Creates an instance of Office365ProjectConnectorDataTypes class. */
+    public Office365ProjectConnectorDataTypes() {
+    }
+
     /**
      * Get the logs property: Logs data type.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Office365ProjectConnectorDataTypesLogs.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Office365ProjectConnectorDataTypesLogs.java
index 80908337be80..01d5bb97c7ca 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Office365ProjectConnectorDataTypesLogs.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Office365ProjectConnectorDataTypesLogs.java
@@ -9,6 +9,10 @@
 /** Logs data type. */
 @Fluent
 public final class Office365ProjectConnectorDataTypesLogs extends DataConnectorDataTypeCommon {
+    /** Creates an instance of Office365ProjectConnectorDataTypesLogs class. */
+    public Office365ProjectConnectorDataTypesLogs() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public Office365ProjectConnectorDataTypesLogs withState(DataTypeState state) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Office365ProjectDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Office365ProjectDataConnector.java
index 7665b6940195..b1ca30836d37 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Office365ProjectDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Office365ProjectDataConnector.java
@@ -22,6 +22,10 @@ public final class Office365ProjectDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private Office365ProjectDataConnectorProperties innerProperties;
 
+    /** Creates an instance of Office365ProjectDataConnector class. */
+    public Office365ProjectDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: Office Microsoft Project data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeAtpCheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeAtpCheckRequirements.java
index 25d2ff4c15b4..29675fa30ff1 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeAtpCheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeAtpCheckRequirements.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.OfficeAtpCheckRequirementsProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -13,7 +13,7 @@
 /** Represents OfficeATP (Office 365 Advanced Threat Protection) requirements check request. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("OfficeATP")
-@Fluent
+@Immutable
 public final class OfficeAtpCheckRequirements extends DataConnectorsCheckRequirements {
     /*
      * OfficeATP (Office 365 Advanced Threat Protection) requirements check properties.
@@ -21,6 +21,10 @@ public final class OfficeAtpCheckRequirements extends DataConnectorsCheckRequire
     @JsonProperty(value = "properties")
     private OfficeAtpCheckRequirementsProperties innerProperties;
 
+    /** Creates an instance of OfficeAtpCheckRequirements class. */
+    public OfficeAtpCheckRequirements() {
+    }
+
     /**
      * Get the innerProperties property: OfficeATP (Office 365 Advanced Threat Protection) requirements check
      * properties.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeAtpDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeAtpDataConnector.java
index 2a339d8590fd..82aa15446f80 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeAtpDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeAtpDataConnector.java
@@ -22,6 +22,10 @@ public final class OfficeAtpDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private OfficeAtpDataConnectorProperties innerProperties;
 
+    /** Creates an instance of OfficeAtpDataConnector class. */
+    public OfficeAtpDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: OfficeATP (Office 365 Advanced Threat Protection) data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeConsentList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeConsentList.java
index c82170f9180d..8d5f713347d2 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeConsentList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeConsentList.java
@@ -25,6 +25,10 @@ public final class OfficeConsentList {
     @JsonProperty(value = "value", required = true)
     private List<OfficeConsentInner> value;
 
+    /** Creates an instance of OfficeConsentList class. */
+    public OfficeConsentList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of office consents.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeConsents.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeConsents.java
index ed83191305b5..65662fbfa49f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeConsents.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeConsents.java
@@ -41,12 +41,14 @@ public interface OfficeConsents {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param consentId consent ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an office365 consent.
+     * @return an office365 consent along with {@link Response}.
      */
-    OfficeConsent get(String resourceGroupName, String workspaceName, String consentId);
+    Response<OfficeConsent> getWithResponse(
+        String resourceGroupName, String workspaceName, String consentId, Context context);
 
     /**
      * Gets an office365 consent.
@@ -54,14 +56,12 @@ public interface OfficeConsents {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param consentId consent ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an office365 consent along with {@link Response}.
+     * @return an office365 consent.
      */
-    Response<OfficeConsent> getWithResponse(
-        String resourceGroupName, String workspaceName, String consentId, Context context);
+    OfficeConsent get(String resourceGroupName, String workspaceName, String consentId);
 
     /**
      * Delete the office365 consent.
@@ -69,11 +69,14 @@ Response<OfficeConsent> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param consentId consent ID.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
-    void delete(String resourceGroupName, String workspaceName, String consentId);
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String consentId, Context context);
 
     /**
      * Delete the office365 consent.
@@ -81,12 +84,9 @@ Response<OfficeConsent> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param consentId consent ID.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
-    Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String consentId, Context context);
+    void delete(String resourceGroupName, String workspaceName, String consentId);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnector.java
index 2fb508346db8..8eef8afb3c95 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnector.java
@@ -22,6 +22,10 @@ public final class OfficeDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private OfficeDataConnectorProperties innerProperties;
 
+    /** Creates an instance of OfficeDataConnector class. */
+    public OfficeDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: Office data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnectorDataTypes.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnectorDataTypes.java
index f96e94afc749..72327b88ce2e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnectorDataTypes.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnectorDataTypes.java
@@ -29,6 +29,10 @@ public final class OfficeDataConnectorDataTypes {
     @JsonProperty(value = "teams", required = true)
     private OfficeDataConnectorDataTypesTeams teams;
 
+    /** Creates an instance of OfficeDataConnectorDataTypes class. */
+    public OfficeDataConnectorDataTypes() {
+    }
+
     /**
      * Get the exchange property: Exchange data type connection.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnectorDataTypesExchange.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnectorDataTypesExchange.java
index f4bb9c178fe0..d5115e8c9b48 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnectorDataTypesExchange.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnectorDataTypesExchange.java
@@ -9,6 +9,10 @@
 /** Exchange data type connection. */
 @Fluent
 public final class OfficeDataConnectorDataTypesExchange extends DataConnectorDataTypeCommon {
+    /** Creates an instance of OfficeDataConnectorDataTypesExchange class. */
+    public OfficeDataConnectorDataTypesExchange() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public OfficeDataConnectorDataTypesExchange withState(DataTypeState state) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnectorDataTypesSharePoint.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnectorDataTypesSharePoint.java
index 85b62eaef4d0..08ab9688e59a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnectorDataTypesSharePoint.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnectorDataTypesSharePoint.java
@@ -9,6 +9,10 @@
 /** SharePoint data type connection. */
 @Fluent
 public final class OfficeDataConnectorDataTypesSharePoint extends DataConnectorDataTypeCommon {
+    /** Creates an instance of OfficeDataConnectorDataTypesSharePoint class. */
+    public OfficeDataConnectorDataTypesSharePoint() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public OfficeDataConnectorDataTypesSharePoint withState(DataTypeState state) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnectorDataTypesTeams.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnectorDataTypesTeams.java
index a16d1b5ddc04..1ff0e69de273 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnectorDataTypesTeams.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeDataConnectorDataTypesTeams.java
@@ -9,6 +9,10 @@
 /** Teams data type connection. */
 @Fluent
 public final class OfficeDataConnectorDataTypesTeams extends DataConnectorDataTypeCommon {
+    /** Creates an instance of OfficeDataConnectorDataTypesTeams class. */
+    public OfficeDataConnectorDataTypesTeams() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public OfficeDataConnectorDataTypesTeams withState(DataTypeState state) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeIrmCheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeIrmCheckRequirements.java
index 0572876278d1..3202730d62ef 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeIrmCheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeIrmCheckRequirements.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.OfficeIrmCheckRequirementsProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -13,7 +13,7 @@
 /** Represents OfficeIRM (Microsoft Insider Risk Management) requirements check request. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("OfficeIRM")
-@Fluent
+@Immutable
 public final class OfficeIrmCheckRequirements extends DataConnectorsCheckRequirements {
     /*
      * OfficeIRM (Microsoft Insider Risk Management) requirements check properties.
@@ -21,6 +21,10 @@ public final class OfficeIrmCheckRequirements extends DataConnectorsCheckRequire
     @JsonProperty(value = "properties")
     private OfficeIrmCheckRequirementsProperties innerProperties;
 
+    /** Creates an instance of OfficeIrmCheckRequirements class. */
+    public OfficeIrmCheckRequirements() {
+    }
+
     /**
      * Get the innerProperties property: OfficeIRM (Microsoft Insider Risk Management) requirements check properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeIrmDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeIrmDataConnector.java
index 0a26b9e45492..da67e7253f68 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeIrmDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficeIrmDataConnector.java
@@ -22,6 +22,10 @@ public final class OfficeIrmDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private OfficeIrmDataConnectorProperties innerProperties;
 
+    /** Creates an instance of OfficeIrmDataConnector class. */
+    public OfficeIrmDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: OfficeIRM (Microsoft Insider Risk Management) data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficePowerBICheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficePowerBICheckRequirements.java
index 8e52f4d91bb2..57332daa3a81 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficePowerBICheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficePowerBICheckRequirements.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.OfficePowerBICheckRequirementsProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -13,7 +13,7 @@
 /** Represents Office PowerBI requirements check request. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("OfficePowerBI")
-@Fluent
+@Immutable
 public final class OfficePowerBICheckRequirements extends DataConnectorsCheckRequirements {
     /*
      * Office Power BI requirements check properties.
@@ -21,6 +21,10 @@ public final class OfficePowerBICheckRequirements extends DataConnectorsCheckReq
     @JsonProperty(value = "properties")
     private OfficePowerBICheckRequirementsProperties innerProperties;
 
+    /** Creates an instance of OfficePowerBICheckRequirements class. */
+    public OfficePowerBICheckRequirements() {
+    }
+
     /**
      * Get the innerProperties property: Office Power BI requirements check properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficePowerBIConnectorDataTypes.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficePowerBIConnectorDataTypes.java
index 42b1400cfcf4..b9df79b02be4 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficePowerBIConnectorDataTypes.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficePowerBIConnectorDataTypes.java
@@ -17,6 +17,10 @@ public final class OfficePowerBIConnectorDataTypes {
     @JsonProperty(value = "logs", required = true)
     private OfficePowerBIConnectorDataTypesLogs logs;
 
+    /** Creates an instance of OfficePowerBIConnectorDataTypes class. */
+    public OfficePowerBIConnectorDataTypes() {
+    }
+
     /**
      * Get the logs property: Logs data type.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficePowerBIConnectorDataTypesLogs.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficePowerBIConnectorDataTypesLogs.java
index 0e71c0fd1cad..a77690e1e4de 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficePowerBIConnectorDataTypesLogs.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficePowerBIConnectorDataTypesLogs.java
@@ -9,6 +9,10 @@
 /** Logs data type. */
 @Fluent
 public final class OfficePowerBIConnectorDataTypesLogs extends DataConnectorDataTypeCommon {
+    /** Creates an instance of OfficePowerBIConnectorDataTypesLogs class. */
+    public OfficePowerBIConnectorDataTypesLogs() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public OfficePowerBIConnectorDataTypesLogs withState(DataTypeState state) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficePowerBIDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficePowerBIDataConnector.java
index 2c7496612394..7ed1a962d32c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficePowerBIDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OfficePowerBIDataConnector.java
@@ -22,6 +22,10 @@ public final class OfficePowerBIDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private OfficePowerBIDataConnectorProperties innerProperties;
 
+    /** Creates an instance of OfficePowerBIDataConnector class. */
+    public OfficePowerBIDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: Office Microsoft PowerBI data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OperationDisplay.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OperationDisplay.java
index 54967890e46e..bad441db6f3b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OperationDisplay.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OperationDisplay.java
@@ -34,6 +34,10 @@ public final class OperationDisplay {
     @JsonProperty(value = "resource")
     private String resource;
 
+    /** Creates an instance of OperationDisplay class. */
+    public OperationDisplay() {
+    }
+
     /**
      * Get the description property: Description of the operation.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OperationsList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OperationsList.java
index 47df47f99519..c88eb98bd944 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OperationsList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/OperationsList.java
@@ -25,6 +25,10 @@ public final class OperationsList {
     @JsonProperty(value = "value", required = true)
     private List<OperationInner> value;
 
+    /** Creates an instance of OperationsList class. */
+    public OperationsList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of operations.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Permissions.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Permissions.java
index cfeebee1b045..be66f72ab3fa 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Permissions.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Permissions.java
@@ -23,6 +23,10 @@ public final class Permissions {
     @JsonProperty(value = "customs")
     private List<PermissionsCustomsItem> customs;
 
+    /** Creates an instance of Permissions class. */
+    public Permissions() {
+    }
+
     /**
      * Get the resourceProvider property: Resource provider permissions required for the connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PermissionsCustomsItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PermissionsCustomsItem.java
index 943909826a2e..7baf23b26bb0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PermissionsCustomsItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PermissionsCustomsItem.java
@@ -9,6 +9,10 @@
 /** The PermissionsCustomsItem model. */
 @Fluent
 public final class PermissionsCustomsItem extends Customs {
+    /** Creates an instance of PermissionsCustomsItem class. */
+    public PermissionsCustomsItem() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public PermissionsCustomsItem withName(String name) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PermissionsResourceProviderItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PermissionsResourceProviderItem.java
index d2db9072abc2..8d49828e934e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PermissionsResourceProviderItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PermissionsResourceProviderItem.java
@@ -9,6 +9,10 @@
 /** The PermissionsResourceProviderItem model. */
 @Fluent
 public final class PermissionsResourceProviderItem extends ResourceProvider {
+    /** Creates an instance of PermissionsResourceProviderItem class. */
+    public PermissionsResourceProviderItem() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public PermissionsResourceProviderItem withProvider(ProviderName provider) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PlaybookActionProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PlaybookActionProperties.java
index 9d85ffb7802b..29995598bf92 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PlaybookActionProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PlaybookActionProperties.java
@@ -23,6 +23,10 @@ public final class PlaybookActionProperties {
     @JsonProperty(value = "tenantId")
     private UUID tenantId;
 
+    /** Creates an instance of PlaybookActionProperties class. */
+    public PlaybookActionProperties() {
+    }
+
     /**
      * Get the logicAppResourceId property: The resource id of the playbook resource.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ProcessEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ProcessEntity.java
index 1d192d71c851..e2c7225f4cb9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ProcessEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ProcessEntity.java
@@ -24,6 +24,10 @@ public final class ProcessEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private ProcessEntityProperties innerProperties;
 
+    /** Creates an instance of ProcessEntity class. */
+    public ProcessEntity() {
+    }
+
     /**
      * Get the innerProperties property: Process entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ProductSettings.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ProductSettings.java
index ead1ce681b97..7dfdea9e34b3 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ProductSettings.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ProductSettings.java
@@ -10,18 +10,6 @@
 
 /** Resource collection API of ProductSettings. */
 public interface ProductSettings {
-    /**
-     * List of all the settings.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return list of all the settings.
-     */
-    SettingList list(String resourceGroupName, String workspaceName);
-
     /**
      * List of all the settings.
      *
@@ -36,17 +24,16 @@ public interface ProductSettings {
     Response<SettingList> listWithResponse(String resourceGroupName, String workspaceName, Context context);
 
     /**
-     * Gets a setting.
+     * List of all the settings.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
-     * @param settingsName The setting name. Supports - Anomalies, EyesOn, EntityAnalytics, Ueba.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a setting.
+     * @return list of all the settings.
      */
-    Settings get(String resourceGroupName, String workspaceName, String settingsName);
+    SettingList list(String resourceGroupName, String workspaceName);
 
     /**
      * Gets a setting.
@@ -64,7 +51,7 @@ Response<Settings> getWithResponse(
         String resourceGroupName, String workspaceName, String settingsName, Context context);
 
     /**
-     * Delete setting of the product.
+     * Gets a setting.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
@@ -72,8 +59,9 @@ Response<Settings> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a setting.
      */
-    void delete(String resourceGroupName, String workspaceName, String settingsName);
+    Settings get(String resourceGroupName, String workspaceName, String settingsName);
 
     /**
      * Delete setting of the product.
@@ -91,18 +79,16 @@ Response<Void> deleteWithResponse(
         String resourceGroupName, String workspaceName, String settingsName, Context context);
 
     /**
-     * Updates setting.
+     * Delete setting of the product.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsName The setting name. Supports - Anomalies, EyesOn, EntityAnalytics, Ueba.
-     * @param settings The setting.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Setting.
      */
-    Settings update(String resourceGroupName, String workspaceName, String settingsName, SettingsInner settings);
+    void delete(String resourceGroupName, String workspaceName, String settingsName);
 
     /**
      * Updates setting.
@@ -119,4 +105,18 @@ Response<Void> deleteWithResponse(
      */
     Response<Settings> updateWithResponse(
         String resourceGroupName, String workspaceName, String settingsName, SettingsInner settings, Context context);
+
+    /**
+     * Updates setting.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param settingsName The setting name. Supports - Anomalies, EyesOn, EntityAnalytics, Ueba.
+     * @param settings The setting.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the Setting.
+     */
+    Settings update(String resourceGroupName, String workspaceName, String settingsName, SettingsInner settings);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PropertyArrayChangedConditionProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PropertyArrayChangedConditionProperties.java
index dc048782a94f..be5d0f5368a5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PropertyArrayChangedConditionProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PropertyArrayChangedConditionProperties.java
@@ -20,6 +20,10 @@ public final class PropertyArrayChangedConditionProperties extends AutomationRul
     @JsonProperty(value = "conditionProperties")
     private AutomationRulePropertyArrayChangedValuesCondition conditionProperties;
 
+    /** Creates an instance of PropertyArrayChangedConditionProperties class. */
+    public PropertyArrayChangedConditionProperties() {
+    }
+
     /**
      * Get the conditionProperties property: The conditionProperties property.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PropertyArrayConditionProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PropertyArrayConditionProperties.java
index a508d41ec873..61d9a767f8ef 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PropertyArrayConditionProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PropertyArrayConditionProperties.java
@@ -20,6 +20,10 @@ public final class PropertyArrayConditionProperties extends AutomationRuleCondit
     @JsonProperty(value = "conditionProperties")
     private AutomationRulePropertyArrayValuesCondition conditionProperties;
 
+    /** Creates an instance of PropertyArrayConditionProperties class. */
+    public PropertyArrayConditionProperties() {
+    }
+
     /**
      * Get the conditionProperties property: The conditionProperties property.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PropertyChangedConditionProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PropertyChangedConditionProperties.java
index 22470af86a46..d0916572cfff 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PropertyChangedConditionProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PropertyChangedConditionProperties.java
@@ -20,6 +20,10 @@ public final class PropertyChangedConditionProperties extends AutomationRuleCond
     @JsonProperty(value = "conditionProperties")
     private AutomationRulePropertyValuesChangedCondition conditionProperties;
 
+    /** Creates an instance of PropertyChangedConditionProperties class. */
+    public PropertyChangedConditionProperties() {
+    }
+
     /**
      * Get the conditionProperties property: The conditionProperties property.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PropertyConditionProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PropertyConditionProperties.java
index 7c641a0bca1e..58c0036f081d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PropertyConditionProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/PropertyConditionProperties.java
@@ -20,6 +20,10 @@ public final class PropertyConditionProperties extends AutomationRuleCondition {
     @JsonProperty(value = "conditionProperties")
     private AutomationRulePropertyValuesCondition conditionProperties;
 
+    /** Creates an instance of PropertyConditionProperties class. */
+    public PropertyConditionProperties() {
+    }
+
     /**
      * Get the conditionProperties property: The conditionProperties property.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/QueryBasedAlertRuleTemplateProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/QueryBasedAlertRuleTemplateProperties.java
index e20070c785ad..edd53dc5ea73 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/QueryBasedAlertRuleTemplateProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/QueryBasedAlertRuleTemplateProperties.java
@@ -56,6 +56,16 @@ public class QueryBasedAlertRuleTemplateProperties {
     @JsonProperty(value = "eventGroupingSettings")
     private EventGroupingSettings eventGroupingSettings;
 
+    /*
+     * Array of the sentinel entity mappings of the alert rule
+     */
+    @JsonProperty(value = "sentinelEntitiesMappings")
+    private List<SentinelEntityMapping> sentinelEntitiesMappings;
+
+    /** Creates an instance of QueryBasedAlertRuleTemplateProperties class. */
+    public QueryBasedAlertRuleTemplateProperties() {
+    }
+
     /**
      * Get the query property: The query that creates alerts for this rule.
      *
@@ -199,6 +209,27 @@ public QueryBasedAlertRuleTemplateProperties withEventGroupingSettings(
         return this;
     }
 
+    /**
+     * Get the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @return the sentinelEntitiesMappings value.
+     */
+    public List<SentinelEntityMapping> sentinelEntitiesMappings() {
+        return this.sentinelEntitiesMappings;
+    }
+
+    /**
+     * Set the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @param sentinelEntitiesMappings the sentinelEntitiesMappings value to set.
+     * @return the QueryBasedAlertRuleTemplateProperties object itself.
+     */
+    public QueryBasedAlertRuleTemplateProperties withSentinelEntitiesMappings(
+        List<SentinelEntityMapping> sentinelEntitiesMappings) {
+        this.sentinelEntitiesMappings = sentinelEntitiesMappings;
+        return this;
+    }
+
     /**
      * Validates the instance.
      *
@@ -214,5 +245,8 @@ public void validate() {
         if (eventGroupingSettings() != null) {
             eventGroupingSettings().validate();
         }
+        if (sentinelEntitiesMappings() != null) {
+            sentinelEntitiesMappings().forEach(e -> e.validate());
+        }
     }
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RegistryKeyEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RegistryKeyEntity.java
index 116afd6feb60..a89770bdaa26 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RegistryKeyEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RegistryKeyEntity.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityInner;
 import com.azure.resourcemanager.securityinsights.fluent.models.RegistryKeyEntityProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -15,7 +15,7 @@
 /** Represents a registry key entity. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("RegistryKey")
-@Fluent
+@Immutable
 public final class RegistryKeyEntity extends EntityInner {
     /*
      * RegistryKey entity properties
@@ -23,6 +23,10 @@ public final class RegistryKeyEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private RegistryKeyEntityProperties innerProperties;
 
+    /** Creates an instance of RegistryKeyEntity class. */
+    public RegistryKeyEntity() {
+    }
+
     /**
      * Get the innerProperties property: RegistryKey entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RegistryValueEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RegistryValueEntity.java
index 8121d653cb19..4ac242b3b299 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RegistryValueEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RegistryValueEntity.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityInner;
 import com.azure.resourcemanager.securityinsights.fluent.models.RegistryValueEntityProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -15,7 +15,7 @@
 /** Represents a registry value entity. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("RegistryValue")
-@Fluent
+@Immutable
 public final class RegistryValueEntity extends EntityInner {
     /*
      * RegistryKey entity properties
@@ -23,6 +23,10 @@ public final class RegistryValueEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private RegistryValueEntityProperties innerProperties;
 
+    /** Creates an instance of RegistryValueEntity class. */
+    public RegistryValueEntity() {
+    }
+
     /**
      * Get the innerProperties property: RegistryKey entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RelationList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RelationList.java
index 7c2e13d40225..fe4afdfb9a10 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RelationList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RelationList.java
@@ -25,6 +25,10 @@ public final class RelationList {
     @JsonProperty(value = "value", required = true)
     private List<RelationInner> value;
 
+    /** Creates an instance of RelationList class. */
+    public RelationList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of relations.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RepoList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RepoList.java
index 02aaa874b88d..87f9c940268c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RepoList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RepoList.java
@@ -25,6 +25,10 @@ public final class RepoList {
     @JsonProperty(value = "value", required = true)
     private List<RepoInner> value;
 
+    /** Creates an instance of RepoList class. */
+    public RepoList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of repositories.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Repository.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Repository.java
index 3e26879725a5..38e3c9a9d8c8 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Repository.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Repository.java
@@ -41,6 +41,10 @@ public final class Repository {
     @JsonProperty(value = "pathMapping")
     private List<ContentPathMap> pathMapping;
 
+    /** Creates an instance of Repository class. */
+    public Repository() {
+    }
+
     /**
      * Get the url property: Url of repository.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RepositoryResourceInfo.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RepositoryResourceInfo.java
index 5e10c94993ff..7b1c24757e91 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RepositoryResourceInfo.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RepositoryResourceInfo.java
@@ -28,6 +28,10 @@ public final class RepositoryResourceInfo {
     @JsonProperty(value = "azureDevOpsResourceInfo")
     private AzureDevOpsResourceInfo azureDevOpsResourceInfo;
 
+    /** Creates an instance of RepositoryResourceInfo class. */
+    public RepositoryResourceInfo() {
+    }
+
     /**
      * Get the webhook property: The webhook object created for the source-control.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RequiredPermissions.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RequiredPermissions.java
index 146d39665d20..c4bd2d0c0ac9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RequiredPermissions.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/RequiredPermissions.java
@@ -34,6 +34,10 @@ public final class RequiredPermissions {
     @JsonProperty(value = "delete")
     private Boolean delete;
 
+    /** Creates an instance of RequiredPermissions class. */
+    public RequiredPermissions() {
+    }
+
     /**
      * Get the action property: action permission.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ResourceProvider.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ResourceProvider.java
index 7024f46e5562..faa24f5c78b9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ResourceProvider.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ResourceProvider.java
@@ -40,6 +40,10 @@ public class ResourceProvider {
     @JsonProperty(value = "requiredPermissions")
     private RequiredPermissions requiredPermissions;
 
+    /** Creates an instance of ResourceProvider class. */
+    public ResourceProvider() {
+    }
+
     /**
      * Get the provider property: Provider name.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ResourceWithEtag.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ResourceWithEtag.java
index 6ed4515163c8..8d8a4234f62d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ResourceWithEtag.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ResourceWithEtag.java
@@ -24,6 +24,10 @@ public class ResourceWithEtag extends ProxyResource {
     @JsonProperty(value = "systemData", access = JsonProperty.Access.WRITE_ONLY)
     private SystemData systemData;
 
+    /** Creates an instance of ResourceWithEtag class. */
+    public ResourceWithEtag() {
+    }
+
     /**
      * Get the etag property: Etag of the azure resource.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SampleQueries.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SampleQueries.java
index 21b538e67f10..9f5f260775fe 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SampleQueries.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SampleQueries.java
@@ -22,6 +22,10 @@ public class SampleQueries {
     @JsonProperty(value = "query")
     private String query;
 
+    /** Creates an instance of SampleQueries class. */
+    public SampleQueries() {
+    }
+
     /**
      * Get the description property: The sample query description.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ScheduledAlertRule.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ScheduledAlertRule.java
index 5d5575688e63..5debb8fd9a84 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ScheduledAlertRule.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ScheduledAlertRule.java
@@ -26,6 +26,10 @@ public final class ScheduledAlertRule extends AlertRuleInner {
     @JsonProperty(value = "properties")
     private ScheduledAlertRuleProperties innerProperties;
 
+    /** Creates an instance of ScheduledAlertRule class. */
+    public ScheduledAlertRule() {
+    }
+
     /**
      * Get the innerProperties property: Scheduled alert rule properties.
      *
@@ -519,6 +523,29 @@ public ScheduledAlertRule withAlertDetailsOverride(AlertDetailsOverride alertDet
         return this;
     }
 
+    /**
+     * Get the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @return the sentinelEntitiesMappings value.
+     */
+    public List<SentinelEntityMapping> sentinelEntitiesMappings() {
+        return this.innerProperties() == null ? null : this.innerProperties().sentinelEntitiesMappings();
+    }
+
+    /**
+     * Set the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @param sentinelEntitiesMappings the sentinelEntitiesMappings value to set.
+     * @return the ScheduledAlertRule object itself.
+     */
+    public ScheduledAlertRule withSentinelEntitiesMappings(List<SentinelEntityMapping> sentinelEntitiesMappings) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ScheduledAlertRuleProperties();
+        }
+        this.innerProperties().withSentinelEntitiesMappings(sentinelEntitiesMappings);
+        return this;
+    }
+
     /**
      * Validates the instance.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ScheduledAlertRuleCommonProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ScheduledAlertRuleCommonProperties.java
index 181410c28e15..6f87af4aca6d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ScheduledAlertRuleCommonProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ScheduledAlertRuleCommonProperties.java
@@ -75,6 +75,16 @@ public class ScheduledAlertRuleCommonProperties {
     @JsonProperty(value = "alertDetailsOverride")
     private AlertDetailsOverride alertDetailsOverride;
 
+    /*
+     * Array of the sentinel entity mappings of the alert rule
+     */
+    @JsonProperty(value = "sentinelEntitiesMappings")
+    private List<SentinelEntityMapping> sentinelEntitiesMappings;
+
+    /** Creates an instance of ScheduledAlertRuleCommonProperties class. */
+    public ScheduledAlertRuleCommonProperties() {
+    }
+
     /**
      * Get the query property: The query that creates alerts for this rule.
      *
@@ -275,6 +285,27 @@ public ScheduledAlertRuleCommonProperties withAlertDetailsOverride(AlertDetailsO
         return this;
     }
 
+    /**
+     * Get the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @return the sentinelEntitiesMappings value.
+     */
+    public List<SentinelEntityMapping> sentinelEntitiesMappings() {
+        return this.sentinelEntitiesMappings;
+    }
+
+    /**
+     * Set the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @param sentinelEntitiesMappings the sentinelEntitiesMappings value to set.
+     * @return the ScheduledAlertRuleCommonProperties object itself.
+     */
+    public ScheduledAlertRuleCommonProperties withSentinelEntitiesMappings(
+        List<SentinelEntityMapping> sentinelEntitiesMappings) {
+        this.sentinelEntitiesMappings = sentinelEntitiesMappings;
+        return this;
+    }
+
     /**
      * Validates the instance.
      *
@@ -290,5 +321,8 @@ public void validate() {
         if (alertDetailsOverride() != null) {
             alertDetailsOverride().validate();
         }
+        if (sentinelEntitiesMappings() != null) {
+            sentinelEntitiesMappings().forEach(e -> e.validate());
+        }
     }
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ScheduledAlertRuleTemplate.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ScheduledAlertRuleTemplate.java
index 143d98192d0d..166b63a35646 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ScheduledAlertRuleTemplate.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ScheduledAlertRuleTemplate.java
@@ -26,6 +26,10 @@ public final class ScheduledAlertRuleTemplate extends AlertRuleTemplateInner {
     @JsonProperty(value = "properties")
     private ScheduledAlertRuleTemplateProperties innerProperties;
 
+    /** Creates an instance of ScheduledAlertRuleTemplate class. */
+    public ScheduledAlertRuleTemplate() {
+    }
+
     /**
      * Get the innerProperties property: Scheduled alert rule template properties.
      *
@@ -470,6 +474,30 @@ public ScheduledAlertRuleTemplate withAlertDetailsOverride(AlertDetailsOverride
         return this;
     }
 
+    /**
+     * Get the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @return the sentinelEntitiesMappings value.
+     */
+    public List<SentinelEntityMapping> sentinelEntitiesMappings() {
+        return this.innerProperties() == null ? null : this.innerProperties().sentinelEntitiesMappings();
+    }
+
+    /**
+     * Set the sentinelEntitiesMappings property: Array of the sentinel entity mappings of the alert rule.
+     *
+     * @param sentinelEntitiesMappings the sentinelEntitiesMappings value to set.
+     * @return the ScheduledAlertRuleTemplate object itself.
+     */
+    public ScheduledAlertRuleTemplate withSentinelEntitiesMappings(
+        List<SentinelEntityMapping> sentinelEntitiesMappings) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ScheduledAlertRuleTemplateProperties();
+        }
+        this.innerProperties().withSentinelEntitiesMappings(sentinelEntitiesMappings);
+        return this;
+    }
+
     /**
      * Validates the instance.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityAlert.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityAlert.java
index 3052a35d0c5c..21f4fc0f0b0c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityAlert.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityAlert.java
@@ -25,6 +25,10 @@ public final class SecurityAlert extends EntityInner {
     @JsonProperty(value = "properties")
     private SecurityAlertProperties innerProperties;
 
+    /** Creates an instance of SecurityAlert class. */
+    public SecurityAlert() {
+    }
+
     /**
      * Get the innerProperties property: SecurityAlert entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityAlertPropertiesConfidenceReasonsItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityAlertPropertiesConfidenceReasonsItem.java
index 3613253e952a..9ab3a972e6e6 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityAlertPropertiesConfidenceReasonsItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityAlertPropertiesConfidenceReasonsItem.java
@@ -22,6 +22,10 @@ public final class SecurityAlertPropertiesConfidenceReasonsItem {
     @JsonProperty(value = "reasonType", access = JsonProperty.Access.WRITE_ONLY)
     private String reasonType;
 
+    /** Creates an instance of SecurityAlertPropertiesConfidenceReasonsItem class. */
+    public SecurityAlertPropertiesConfidenceReasonsItem() {
+    }
+
     /**
      * Get the reason property: The reason's description.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityAlertTimelineItem.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityAlertTimelineItem.java
index a34da5bbcc1a..18476bc7bf7c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityAlertTimelineItem.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityAlertTimelineItem.java
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import java.time.OffsetDateTime;
+import java.util.List;
 
 /** Represents security alert timeline item. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
@@ -70,6 +71,22 @@ public final class SecurityAlertTimelineItem extends EntityTimelineItem {
     @JsonProperty(value = "alertType", required = true)
     private String alertType;
 
+    /*
+     * The intent of the alert.
+     */
+    @JsonProperty(value = "intent", access = JsonProperty.Access.WRITE_ONLY)
+    private KillChainIntent intent;
+
+    /*
+     * The techniques of the alert.
+     */
+    @JsonProperty(value = "techniques")
+    private List<String> techniques;
+
+    /** Creates an instance of SecurityAlertTimelineItem class. */
+    public SecurityAlertTimelineItem() {
+    }
+
     /**
      * Get the azureResourceId property: The alert azure resource id.
      *
@@ -250,6 +267,35 @@ public SecurityAlertTimelineItem withAlertType(String alertType) {
         return this;
     }
 
+    /**
+     * Get the intent property: The intent of the alert.
+     *
+     * @return the intent value.
+     */
+    public KillChainIntent intent() {
+        return this.intent;
+    }
+
+    /**
+     * Get the techniques property: The techniques of the alert.
+     *
+     * @return the techniques value.
+     */
+    public List<String> techniques() {
+        return this.techniques;
+    }
+
+    /**
+     * Set the techniques property: The techniques of the alert.
+     *
+     * @param techniques the techniques value to set.
+     * @return the SecurityAlertTimelineItem object itself.
+     */
+    public SecurityAlertTimelineItem withTechniques(List<String> techniques) {
+        this.techniques = techniques;
+        return this;
+    }
+
     /**
      * Validates the instance.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityGroupEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityGroupEntity.java
index 119f867b58eb..c934ef040221 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityGroupEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityGroupEntity.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityInner;
 import com.azure.resourcemanager.securityinsights.fluent.models.SecurityGroupEntityProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -16,7 +16,7 @@
 /** Represents a security group entity. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("SecurityGroup")
-@Fluent
+@Immutable
 public final class SecurityGroupEntity extends EntityInner {
     /*
      * SecurityGroup entity properties
@@ -24,6 +24,10 @@ public final class SecurityGroupEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private SecurityGroupEntityProperties innerProperties;
 
+    /** Creates an instance of SecurityGroupEntity class. */
+    public SecurityGroupEntity() {
+    }
+
     /**
      * Get the innerProperties property: SecurityGroup entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityMLAnalyticsSettings.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityMLAnalyticsSettings.java
index eb9b7a727ef6..16f1f3a2a2ef 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityMLAnalyticsSettings.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityMLAnalyticsSettings.java
@@ -42,12 +42,14 @@ public interface SecurityMLAnalyticsSettings {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Security ML Analytics Settings.
+     * @return the Security ML Analytics Settings along with {@link Response}.
      */
-    SecurityMLAnalyticsSetting get(String resourceGroupName, String workspaceName, String settingsResourceName);
+    Response<SecurityMLAnalyticsSetting> getWithResponse(
+        String resourceGroupName, String workspaceName, String settingsResourceName, Context context);
 
     /**
      * Gets the Security ML Analytics Settings.
@@ -55,14 +57,12 @@ public interface SecurityMLAnalyticsSettings {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Security ML Analytics Settings along with {@link Response}.
+     * @return the Security ML Analytics Settings.
      */
-    Response<SecurityMLAnalyticsSetting> getWithResponse(
-        String resourceGroupName, String workspaceName, String settingsResourceName, Context context);
+    SecurityMLAnalyticsSetting get(String resourceGroupName, String workspaceName, String settingsResourceName);
 
     /**
      * Creates or updates the Security ML Analytics Settings.
@@ -71,16 +71,18 @@ Response<SecurityMLAnalyticsSetting> getWithResponse(
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
      * @param securityMLAnalyticsSetting The security ML Analytics setting.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return security ML Analytics Setting.
+     * @return security ML Analytics Setting along with {@link Response}.
      */
-    SecurityMLAnalyticsSetting createOrUpdate(
+    Response<SecurityMLAnalyticsSetting> createOrUpdateWithResponse(
         String resourceGroupName,
         String workspaceName,
         String settingsResourceName,
-        SecurityMLAnalyticsSettingInner securityMLAnalyticsSetting);
+        SecurityMLAnalyticsSettingInner securityMLAnalyticsSetting,
+        Context context);
 
     /**
      * Creates or updates the Security ML Analytics Settings.
@@ -89,18 +91,16 @@ SecurityMLAnalyticsSetting createOrUpdate(
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
      * @param securityMLAnalyticsSetting The security ML Analytics setting.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return security ML Analytics Setting along with {@link Response}.
+     * @return security ML Analytics Setting.
      */
-    Response<SecurityMLAnalyticsSetting> createOrUpdateWithResponse(
+    SecurityMLAnalyticsSetting createOrUpdate(
         String resourceGroupName,
         String workspaceName,
         String settingsResourceName,
-        SecurityMLAnalyticsSettingInner securityMLAnalyticsSetting,
-        Context context);
+        SecurityMLAnalyticsSettingInner securityMLAnalyticsSetting);
 
     /**
      * Delete the Security ML Analytics Settings.
@@ -108,11 +108,14 @@ Response<SecurityMLAnalyticsSetting> createOrUpdateWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
-    void delete(String resourceGroupName, String workspaceName, String settingsResourceName);
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String settingsResourceName, Context context);
 
     /**
      * Delete the Security ML Analytics Settings.
@@ -120,12 +123,9 @@ Response<SecurityMLAnalyticsSetting> createOrUpdateWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param settingsResourceName Security ML Analytics Settings resource name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
-    Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String settingsResourceName, Context context);
+    void delete(String resourceGroupName, String workspaceName, String settingsResourceName);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityMLAnalyticsSettingsDataSource.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityMLAnalyticsSettingsDataSource.java
index 25eeab69e8b9..1f6989b76202 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityMLAnalyticsSettingsDataSource.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityMLAnalyticsSettingsDataSource.java
@@ -23,6 +23,10 @@ public final class SecurityMLAnalyticsSettingsDataSource {
     @JsonProperty(value = "dataTypes")
     private List<String> dataTypes;
 
+    /** Creates an instance of SecurityMLAnalyticsSettingsDataSource class. */
+    public SecurityMLAnalyticsSettingsDataSource() {
+    }
+
     /**
      * Get the connectorId property: The connector id that provides the following data types.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityMLAnalyticsSettingsList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityMLAnalyticsSettingsList.java
index 8b72b6ba1ce9..da720ca5591b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityMLAnalyticsSettingsList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SecurityMLAnalyticsSettingsList.java
@@ -25,6 +25,10 @@ public final class SecurityMLAnalyticsSettingsList {
     @JsonProperty(value = "value", required = true)
     private List<SecurityMLAnalyticsSettingInner> value;
 
+    /** Creates an instance of SecurityMLAnalyticsSettingsList class. */
+    public SecurityMLAnalyticsSettingsList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of SecurityMLAnalyticsSettings.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SentinelEntityMapping.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SentinelEntityMapping.java
new file mode 100644
index 000000000000..6185131fba80
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SentinelEntityMapping.java
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.models;
+
+import com.azure.core.annotation.Fluent;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/** A single sentinel entity mapping. */
+@Fluent
+public final class SentinelEntityMapping {
+    /*
+     * the column name to be mapped to the SentinelEntities
+     */
+    @JsonProperty(value = "columnName")
+    private String columnName;
+
+    /** Creates an instance of SentinelEntityMapping class. */
+    public SentinelEntityMapping() {
+    }
+
+    /**
+     * Get the columnName property: the column name to be mapped to the SentinelEntities.
+     *
+     * @return the columnName value.
+     */
+    public String columnName() {
+        return this.columnName;
+    }
+
+    /**
+     * Set the columnName property: the column name to be mapped to the SentinelEntities.
+     *
+     * @param columnName the columnName value to set.
+     * @return the SentinelEntityMapping object itself.
+     */
+    public SentinelEntityMapping withColumnName(String columnName) {
+        this.columnName = columnName;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     *
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+}
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SentinelOnboardingStates.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SentinelOnboardingStates.java
index abcc5d92aa34..97d1d3a659b0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SentinelOnboardingStates.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SentinelOnboardingStates.java
@@ -15,12 +15,14 @@ public interface SentinelOnboardingStates {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sentinelOnboardingStateName The Sentinel onboarding state name. Supports - default.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return sentinel onboarding state.
+     * @return sentinel onboarding state along with {@link Response}.
      */
-    SentinelOnboardingState get(String resourceGroupName, String workspaceName, String sentinelOnboardingStateName);
+    Response<SentinelOnboardingState> getWithResponse(
+        String resourceGroupName, String workspaceName, String sentinelOnboardingStateName, Context context);
 
     /**
      * Get Sentinel onboarding state.
@@ -28,14 +30,12 @@ public interface SentinelOnboardingStates {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sentinelOnboardingStateName The Sentinel onboarding state name. Supports - default.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return sentinel onboarding state along with {@link Response}.
+     * @return sentinel onboarding state.
      */
-    Response<SentinelOnboardingState> getWithResponse(
-        String resourceGroupName, String workspaceName, String sentinelOnboardingStateName, Context context);
+    SentinelOnboardingState get(String resourceGroupName, String workspaceName, String sentinelOnboardingStateName);
 
     /**
      * Delete Sentinel onboarding state.
@@ -43,11 +43,14 @@ Response<SentinelOnboardingState> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sentinelOnboardingStateName The Sentinel onboarding state name. Supports - default.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
-    void delete(String resourceGroupName, String workspaceName, String sentinelOnboardingStateName);
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String sentinelOnboardingStateName, Context context);
 
     /**
      * Delete Sentinel onboarding state.
@@ -55,40 +58,37 @@ Response<SentinelOnboardingState> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sentinelOnboardingStateName The Sentinel onboarding state name. Supports - default.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
-    Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String sentinelOnboardingStateName, Context context);
+    void delete(String resourceGroupName, String workspaceName, String sentinelOnboardingStateName);
 
     /**
      * Gets all Sentinel onboarding states.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all Sentinel onboarding states.
+     * @return all Sentinel onboarding states along with {@link Response}.
      */
-    SentinelOnboardingStatesList list(String resourceGroupName, String workspaceName);
+    Response<SentinelOnboardingStatesList> listWithResponse(
+        String resourceGroupName, String workspaceName, Context context);
 
     /**
      * Gets all Sentinel onboarding states.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all Sentinel onboarding states along with {@link Response}.
+     * @return all Sentinel onboarding states.
      */
-    Response<SentinelOnboardingStatesList> listWithResponse(
-        String resourceGroupName, String workspaceName, Context context);
+    SentinelOnboardingStatesList list(String resourceGroupName, String workspaceName);
 
     /**
      * Get Sentinel onboarding state.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SourceControlList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SourceControlList.java
index 8fa041261e9a..e527e9d824cd 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SourceControlList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SourceControlList.java
@@ -25,6 +25,10 @@ public final class SourceControlList {
     @JsonProperty(value = "value", required = true)
     private List<SourceControlInner> value;
 
+    /** Creates an instance of SourceControlList class. */
+    public SourceControlList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of source controls.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SourceControlsOperations.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SourceControlsOperations.java
index d7301e3d70cc..d01a07177d78 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SourceControlsOperations.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SourceControlsOperations.java
@@ -41,12 +41,14 @@ public interface SourceControlsOperations {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sourceControlId Source control Id.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a source control byt its identifier.
+     * @return a source control byt its identifier along with {@link Response}.
      */
-    SourceControl get(String resourceGroupName, String workspaceName, String sourceControlId);
+    Response<SourceControl> getWithResponse(
+        String resourceGroupName, String workspaceName, String sourceControlId, Context context);
 
     /**
      * Gets a source control byt its identifier.
@@ -54,14 +56,12 @@ public interface SourceControlsOperations {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sourceControlId Source control Id.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a source control byt its identifier along with {@link Response}.
+     * @return a source control byt its identifier.
      */
-    Response<SourceControl> getWithResponse(
-        String resourceGroupName, String workspaceName, String sourceControlId, Context context);
+    SourceControl get(String resourceGroupName, String workspaceName, String sourceControlId);
 
     /**
      * Delete a source control.
@@ -69,11 +69,14 @@ Response<SourceControl> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sourceControlId Source control Id.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
-    void delete(String resourceGroupName, String workspaceName, String sourceControlId);
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String sourceControlId, Context context);
 
     /**
      * Delete a source control.
@@ -81,14 +84,11 @@ Response<SourceControl> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param sourceControlId Source control Id.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
-    Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String sourceControlId, Context context);
+    void delete(String resourceGroupName, String workspaceName, String sourceControlId);
 
     /**
      * Gets a source control byt its identifier.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SubmissionMailEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SubmissionMailEntity.java
index e1aa218951ef..573224bc8aad 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SubmissionMailEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/SubmissionMailEntity.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityInner;
 import com.azure.resourcemanager.securityinsights.fluent.models.SubmissionMailEntityProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -17,7 +17,7 @@
 /** Represents a submission mail entity. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("SubmissionMail")
-@Fluent
+@Immutable
 public final class SubmissionMailEntity extends EntityInner {
     /*
      * Submission mail entity properties
@@ -25,6 +25,10 @@ public final class SubmissionMailEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private SubmissionMailEntityProperties innerProperties;
 
+    /** Creates an instance of SubmissionMailEntity class. */
+    public SubmissionMailEntity() {
+    }
+
     /**
      * Get the innerProperties property: Submission mail entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TICheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TICheckRequirements.java
index 897fc3f44ce7..a828d8ed5e33 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TICheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TICheckRequirements.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.TICheckRequirementsProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -13,7 +13,7 @@
 /** Threat Intelligence Platforms data connector check requirements. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("ThreatIntelligence")
-@Fluent
+@Immutable
 public final class TICheckRequirements extends DataConnectorsCheckRequirements {
     /*
      * Threat Intelligence Platforms data connector check required properties
@@ -21,6 +21,10 @@ public final class TICheckRequirements extends DataConnectorsCheckRequirements {
     @JsonProperty(value = "properties")
     private TICheckRequirementsProperties innerProperties;
 
+    /** Creates an instance of TICheckRequirements class. */
+    public TICheckRequirements() {
+    }
+
     /**
      * Get the innerProperties property: Threat Intelligence Platforms data connector check required properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TIDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TIDataConnector.java
index 4d49f30e45e9..bddbd2d00a83 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TIDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TIDataConnector.java
@@ -23,6 +23,10 @@ public final class TIDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private TIDataConnectorProperties innerProperties;
 
+    /** Creates an instance of TIDataConnector class. */
+    public TIDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: TI (Threat Intelligence) data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TIDataConnectorDataTypes.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TIDataConnectorDataTypes.java
index 6615ba9b2f74..728473320a94 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TIDataConnectorDataTypes.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TIDataConnectorDataTypes.java
@@ -17,6 +17,10 @@ public final class TIDataConnectorDataTypes {
     @JsonProperty(value = "indicators", required = true)
     private TIDataConnectorDataTypesIndicators indicators;
 
+    /** Creates an instance of TIDataConnectorDataTypes class. */
+    public TIDataConnectorDataTypes() {
+    }
+
     /**
      * Get the indicators property: Data type for indicators connection.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TIDataConnectorDataTypesIndicators.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TIDataConnectorDataTypesIndicators.java
index a51ae50a528a..84b7c9e247af 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TIDataConnectorDataTypesIndicators.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TIDataConnectorDataTypesIndicators.java
@@ -9,6 +9,10 @@
 /** Data type for indicators connection. */
 @Fluent
 public final class TIDataConnectorDataTypesIndicators extends DataConnectorDataTypeCommon {
+    /** Creates an instance of TIDataConnectorDataTypesIndicators class. */
+    public TIDataConnectorDataTypesIndicators() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public TIDataConnectorDataTypesIndicators withState(DataTypeState state) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TeamProperties.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TeamProperties.java
index 40d641ab8453..07808ec2b081 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TeamProperties.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TeamProperties.java
@@ -37,6 +37,10 @@ public final class TeamProperties {
     @JsonProperty(value = "groupIds")
     private List<UUID> groupIds;
 
+    /** Creates an instance of TeamProperties class. */
+    public TeamProperties() {
+    }
+
     /**
      * Get the teamName property: The name of the team.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligence.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligence.java
index 9acbec19c77f..fb95037b9ee0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligence.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligence.java
@@ -46,6 +46,10 @@ public final class ThreatIntelligence {
     @JsonProperty(value = "threatType", access = JsonProperty.Access.WRITE_ONLY)
     private String threatType;
 
+    /** Creates an instance of ThreatIntelligence class. */
+    public ThreatIntelligence() {
+    }
+
     /**
      * Get the confidence property: Confidence (must be between 0 and 1).
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceAlertRule.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceAlertRule.java
index 924536281280..270af876c434 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceAlertRule.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceAlertRule.java
@@ -24,6 +24,10 @@ public final class ThreatIntelligenceAlertRule extends AlertRuleInner {
     @JsonProperty(value = "properties")
     private ThreatIntelligenceAlertRuleProperties innerProperties;
 
+    /** Creates an instance of ThreatIntelligenceAlertRule class. */
+    public ThreatIntelligenceAlertRule() {
+    }
+
     /**
      * Get the innerProperties property: Threat Intelligence alert rule properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceAlertRuleTemplate.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceAlertRuleTemplate.java
index 734f6a42748a..ad91fae35db7 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceAlertRuleTemplate.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceAlertRuleTemplate.java
@@ -24,6 +24,10 @@ public final class ThreatIntelligenceAlertRuleTemplate extends AlertRuleTemplate
     @JsonProperty(value = "properties")
     private ThreatIntelligenceAlertRuleTemplateProperties innerProperties;
 
+    /** Creates an instance of ThreatIntelligenceAlertRuleTemplate class. */
+    public ThreatIntelligenceAlertRuleTemplate() {
+    }
+
     /**
      * Get the innerProperties property: Threat Intelligence alert rule template properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceAppendTags.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceAppendTags.java
index 847257381b59..38a0f63db31c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceAppendTags.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceAppendTags.java
@@ -17,6 +17,10 @@ public final class ThreatIntelligenceAppendTags {
     @JsonProperty(value = "threatIntelligenceTags")
     private List<String> threatIntelligenceTags;
 
+    /** Creates an instance of ThreatIntelligenceAppendTags class. */
+    public ThreatIntelligenceAppendTags() {
+    }
+
     /**
      * Get the threatIntelligenceTags property: List of tags to be appended.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceExternalReference.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceExternalReference.java
index 689e8a88e564..7a86d8fe30a1 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceExternalReference.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceExternalReference.java
@@ -43,6 +43,10 @@ public final class ThreatIntelligenceExternalReference {
     @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, String> hashes;
 
+    /** Creates an instance of ThreatIntelligenceExternalReference class. */
+    public ThreatIntelligenceExternalReference() {
+    }
+
     /**
      * Get the description property: External reference description.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceFilteringCriteria.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceFilteringCriteria.java
index 86be0cc60915..cecf231a67e7 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceFilteringCriteria.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceFilteringCriteria.java
@@ -89,6 +89,10 @@ public final class ThreatIntelligenceFilteringCriteria {
     @JsonProperty(value = "skipToken")
     private String skipToken;
 
+    /** Creates an instance of ThreatIntelligenceFilteringCriteria class. */
+    public ThreatIntelligenceFilteringCriteria() {
+    }
+
     /**
      * Get the pageSize property: Page size.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceGranularMarkingModel.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceGranularMarkingModel.java
index bb55e6966794..b052bbc4a4bb 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceGranularMarkingModel.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceGranularMarkingModel.java
@@ -29,6 +29,10 @@ public final class ThreatIntelligenceGranularMarkingModel {
     @JsonProperty(value = "selectors")
     private List<String> selectors;
 
+    /** Creates an instance of ThreatIntelligenceGranularMarkingModel class. */
+    public ThreatIntelligenceGranularMarkingModel() {
+    }
+
     /**
      * Get the language property: Language granular marking model.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceIndicatorMetrics.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceIndicatorMetrics.java
index a9e60f800660..540eca0eb46c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceIndicatorMetrics.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceIndicatorMetrics.java
@@ -14,25 +14,25 @@ public interface ThreatIntelligenceIndicatorMetrics {
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence indicators metrics (Indicators counts by Type, Threat Type, Source).
+     * @return threat intelligence indicators metrics (Indicators counts by Type, Threat Type, Source) along with {@link
+     *     Response}.
      */
-    ThreatIntelligenceMetricsList list(String resourceGroupName, String workspaceName);
+    Response<ThreatIntelligenceMetricsList> listWithResponse(
+        String resourceGroupName, String workspaceName, Context context);
 
     /**
      * Get threat intelligence indicators metrics (Indicators counts by Type, Threat Type, Source).
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence indicators metrics (Indicators counts by Type, Threat Type, Source) along with {@link
-     *     Response}.
+     * @return threat intelligence indicators metrics (Indicators counts by Type, Threat Type, Source).
      */
-    Response<ThreatIntelligenceMetricsList> listWithResponse(
-        String resourceGroupName, String workspaceName, Context context);
+    ThreatIntelligenceMetricsList list(String resourceGroupName, String workspaceName);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceIndicatorModel.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceIndicatorModel.java
index 5ce9f114369e..cb0c015043d2 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceIndicatorModel.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceIndicatorModel.java
@@ -24,6 +24,10 @@ public final class ThreatIntelligenceIndicatorModel extends ThreatIntelligenceIn
     @JsonProperty(value = "properties")
     private ThreatIntelligenceIndicatorProperties innerProperties;
 
+    /** Creates an instance of ThreatIntelligenceIndicatorModel class. */
+    public ThreatIntelligenceIndicatorModel() {
+    }
+
     /**
      * Get the innerProperties property: Threat Intelligence Entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceIndicators.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceIndicators.java
index 464cb4b65fbe..bf1b6241afe0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceIndicators.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceIndicators.java
@@ -10,20 +10,6 @@
 
 /** Resource collection API of ThreatIntelligenceIndicators. */
 public interface ThreatIntelligenceIndicators {
-    /**
-     * Create a new threat intelligence indicator.
-     *
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param workspaceName The name of the workspace.
-     * @param threatIntelligenceProperties Properties of threat intelligence indicators to create and update.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence information object.
-     */
-    ThreatIntelligenceInformation createIndicator(
-        String resourceGroupName, String workspaceName, ThreatIntelligenceIndicatorModel threatIntelligenceProperties);
-
     /**
      * Create a new threat intelligence indicator.
      *
@@ -43,17 +29,18 @@ Response<ThreatIntelligenceInformation> createIndicatorWithResponse(
         Context context);
 
     /**
-     * View a threat intelligence indicator by name.
+     * Create a new threat intelligence indicator.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
-     * @param name Threat intelligence indicator name field.
+     * @param threatIntelligenceProperties Properties of threat intelligence indicators to create and update.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return threat intelligence information object.
      */
-    ThreatIntelligenceInformation get(String resourceGroupName, String workspaceName, String name);
+    ThreatIntelligenceInformation createIndicator(
+        String resourceGroupName, String workspaceName, ThreatIntelligenceIndicatorModel threatIntelligenceProperties);
 
     /**
      * View a threat intelligence indicator by name.
@@ -71,22 +58,17 @@ Response<ThreatIntelligenceInformation> getWithResponse(
         String resourceGroupName, String workspaceName, String name, Context context);
 
     /**
-     * Update a threat Intelligence indicator.
+     * View a threat intelligence indicator by name.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
-     * @param threatIntelligenceProperties Properties of threat intelligence indicators to create and update.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return threat intelligence information object.
      */
-    ThreatIntelligenceInformation create(
-        String resourceGroupName,
-        String workspaceName,
-        String name,
-        ThreatIntelligenceIndicatorModel threatIntelligenceProperties);
+    ThreatIntelligenceInformation get(String resourceGroupName, String workspaceName, String name);
 
     /**
      * Update a threat Intelligence indicator.
@@ -109,16 +91,22 @@ Response<ThreatIntelligenceInformation> createWithResponse(
         Context context);
 
     /**
-     * Delete a threat intelligence indicator.
+     * Update a threat Intelligence indicator.
      *
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
+     * @param threatIntelligenceProperties Properties of threat intelligence indicators to create and update.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return threat intelligence information object.
      */
-    void delete(String resourceGroupName, String workspaceName, String name);
+    ThreatIntelligenceInformation create(
+        String resourceGroupName,
+        String workspaceName,
+        String name,
+        ThreatIntelligenceIndicatorModel threatIntelligenceProperties);
 
     /**
      * Delete a threat intelligence indicator.
@@ -134,6 +122,18 @@ Response<ThreatIntelligenceInformation> createWithResponse(
      */
     Response<Void> deleteWithResponse(String resourceGroupName, String workspaceName, String name, Context context);
 
+    /**
+     * Delete a threat intelligence indicator.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param name Threat intelligence indicator name field.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void delete(String resourceGroupName, String workspaceName, String name);
+
     /**
      * Query threat intelligence indicators as per filtering criteria.
      *
@@ -175,15 +175,18 @@ PagedIterable<ThreatIntelligenceInformation> queryIndicators(
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
      * @param threatIntelligenceAppendTags The threat intelligence append tags request body.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
-    void appendTags(
+    Response<Void> appendTagsWithResponse(
         String resourceGroupName,
         String workspaceName,
         String name,
-        ThreatIntelligenceAppendTags threatIntelligenceAppendTags);
+        ThreatIntelligenceAppendTags threatIntelligenceAppendTags,
+        Context context);
 
     /**
      * Append tags to a threat intelligence indicator.
@@ -192,18 +195,15 @@ void appendTags(
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
      * @param threatIntelligenceAppendTags The threat intelligence append tags request body.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
-    Response<Void> appendTagsWithResponse(
+    void appendTags(
         String resourceGroupName,
         String workspaceName,
         String name,
-        ThreatIntelligenceAppendTags threatIntelligenceAppendTags,
-        Context context);
+        ThreatIntelligenceAppendTags threatIntelligenceAppendTags);
 
     /**
      * Replace tags added to a threat intelligence indicator.
@@ -212,16 +212,18 @@ Response<Void> appendTagsWithResponse(
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
      * @param threatIntelligenceReplaceTags Tags in the threat intelligence indicator to be replaced.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence information object.
+     * @return threat intelligence information object along with {@link Response}.
      */
-    ThreatIntelligenceInformation replaceTags(
+    Response<ThreatIntelligenceInformation> replaceTagsWithResponse(
         String resourceGroupName,
         String workspaceName,
         String name,
-        ThreatIntelligenceIndicatorModel threatIntelligenceReplaceTags);
+        ThreatIntelligenceIndicatorModel threatIntelligenceReplaceTags,
+        Context context);
 
     /**
      * Replace tags added to a threat intelligence indicator.
@@ -230,16 +232,14 @@ ThreatIntelligenceInformation replaceTags(
      * @param workspaceName The name of the workspace.
      * @param name Threat intelligence indicator name field.
      * @param threatIntelligenceReplaceTags Tags in the threat intelligence indicator to be replaced.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return threat intelligence information object along with {@link Response}.
+     * @return threat intelligence information object.
      */
-    Response<ThreatIntelligenceInformation> replaceTagsWithResponse(
+    ThreatIntelligenceInformation replaceTags(
         String resourceGroupName,
         String workspaceName,
         String name,
-        ThreatIntelligenceIndicatorModel threatIntelligenceReplaceTags,
-        Context context);
+        ThreatIntelligenceIndicatorModel threatIntelligenceReplaceTags);
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceInformationList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceInformationList.java
index 63195abe89bb..fc8d2b29c70c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceInformationList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceInformationList.java
@@ -25,6 +25,10 @@ public final class ThreatIntelligenceInformationList {
     @JsonProperty(value = "value", required = true)
     private List<ThreatIntelligenceInformationInner> value;
 
+    /** Creates an instance of ThreatIntelligenceInformationList class. */
+    public ThreatIntelligenceInformationList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of information objects.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceKillChainPhase.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceKillChainPhase.java
index 8a1ba6f2bd1d..b9da00cd0cc6 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceKillChainPhase.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceKillChainPhase.java
@@ -22,6 +22,10 @@ public final class ThreatIntelligenceKillChainPhase {
     @JsonProperty(value = "phaseName")
     private String phaseName;
 
+    /** Creates an instance of ThreatIntelligenceKillChainPhase class. */
+    public ThreatIntelligenceKillChainPhase() {
+    }
+
     /**
      * Get the killChainName property: Kill chainName name.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceMetric.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceMetric.java
index 2cb0c00e17c5..b1a55af9a16e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceMetric.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceMetric.java
@@ -35,6 +35,10 @@ public final class ThreatIntelligenceMetric {
     @JsonProperty(value = "sourceMetrics")
     private List<ThreatIntelligenceMetricEntity> sourceMetrics;
 
+    /** Creates an instance of ThreatIntelligenceMetric class. */
+    public ThreatIntelligenceMetric() {
+    }
+
     /**
      * Get the lastUpdatedTimeUtc property: Last updated indicator metric.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceMetricEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceMetricEntity.java
index 62bd0e31c2fc..9c4b6e14c4a9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceMetricEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceMetricEntity.java
@@ -22,6 +22,10 @@ public final class ThreatIntelligenceMetricEntity {
     @JsonProperty(value = "metricValue")
     private Integer metricValue;
 
+    /** Creates an instance of ThreatIntelligenceMetricEntity class. */
+    public ThreatIntelligenceMetricEntity() {
+    }
+
     /**
      * Get the metricName property: Metric name.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceMetrics.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceMetrics.java
index 2d20ceae39ac..512a2b5cb907 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceMetrics.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceMetrics.java
@@ -16,6 +16,10 @@ public final class ThreatIntelligenceMetrics {
     @JsonProperty(value = "properties")
     private ThreatIntelligenceMetric properties;
 
+    /** Creates an instance of ThreatIntelligenceMetrics class. */
+    public ThreatIntelligenceMetrics() {
+    }
+
     /**
      * Get the properties property: Threat intelligence metrics.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceParsedPattern.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceParsedPattern.java
index 1a80738051c9..f4b8451c20be 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceParsedPattern.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceParsedPattern.java
@@ -23,6 +23,10 @@ public final class ThreatIntelligenceParsedPattern {
     @JsonProperty(value = "patternTypeValues")
     private List<ThreatIntelligenceParsedPatternTypeValue> patternTypeValues;
 
+    /** Creates an instance of ThreatIntelligenceParsedPattern class. */
+    public ThreatIntelligenceParsedPattern() {
+    }
+
     /**
      * Get the patternTypeKey property: Pattern type key.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceParsedPatternTypeValue.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceParsedPatternTypeValue.java
index ead9ca6b8833..9753eba99ef8 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceParsedPatternTypeValue.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceParsedPatternTypeValue.java
@@ -22,6 +22,10 @@ public final class ThreatIntelligenceParsedPatternTypeValue {
     @JsonProperty(value = "value")
     private String value;
 
+    /** Creates an instance of ThreatIntelligenceParsedPatternTypeValue class. */
+    public ThreatIntelligenceParsedPatternTypeValue() {
+    }
+
     /**
      * Get the valueType property: Type of the value.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceSortingCriteria.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceSortingCriteria.java
index 7c51d95d08ad..a09ed7f49e5e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceSortingCriteria.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ThreatIntelligenceSortingCriteria.java
@@ -22,6 +22,10 @@ public final class ThreatIntelligenceSortingCriteria {
     @JsonProperty(value = "sortOrder")
     private ThreatIntelligenceSortingCriteriaEnum sortOrder;
 
+    /** Creates an instance of ThreatIntelligenceSortingCriteria class. */
+    public ThreatIntelligenceSortingCriteria() {
+    }
+
     /**
      * Get the itemKey property: Column name.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TiTaxiiCheckRequirements.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TiTaxiiCheckRequirements.java
index a6e561d9e99e..ac4de66b9fa0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TiTaxiiCheckRequirements.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TiTaxiiCheckRequirements.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.TiTaxiiCheckRequirementsProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -13,7 +13,7 @@
 /** Threat Intelligence TAXII data connector check requirements. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("ThreatIntelligenceTaxii")
-@Fluent
+@Immutable
 public final class TiTaxiiCheckRequirements extends DataConnectorsCheckRequirements {
     /*
      * Threat Intelligence TAXII check required properties.
@@ -21,6 +21,10 @@ public final class TiTaxiiCheckRequirements extends DataConnectorsCheckRequireme
     @JsonProperty(value = "properties")
     private TiTaxiiCheckRequirementsProperties innerProperties;
 
+    /** Creates an instance of TiTaxiiCheckRequirements class. */
+    public TiTaxiiCheckRequirements() {
+    }
+
     /**
      * Get the innerProperties property: Threat Intelligence TAXII check required properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TiTaxiiDataConnector.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TiTaxiiDataConnector.java
index 125e1dd55a28..abc44000e104 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TiTaxiiDataConnector.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TiTaxiiDataConnector.java
@@ -23,6 +23,10 @@ public final class TiTaxiiDataConnector extends DataConnectorInner {
     @JsonProperty(value = "properties")
     private TiTaxiiDataConnectorProperties innerProperties;
 
+    /** Creates an instance of TiTaxiiDataConnector class. */
+    public TiTaxiiDataConnector() {
+    }
+
     /**
      * Get the innerProperties property: Threat intelligence TAXII data connector properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TiTaxiiDataConnectorDataTypes.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TiTaxiiDataConnectorDataTypes.java
index 22f12b8a6ab9..520e9eb072da 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TiTaxiiDataConnectorDataTypes.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TiTaxiiDataConnectorDataTypes.java
@@ -17,6 +17,10 @@ public final class TiTaxiiDataConnectorDataTypes {
     @JsonProperty(value = "taxiiClient", required = true)
     private TiTaxiiDataConnectorDataTypesTaxiiClient taxiiClient;
 
+    /** Creates an instance of TiTaxiiDataConnectorDataTypes class. */
+    public TiTaxiiDataConnectorDataTypes() {
+    }
+
     /**
      * Get the taxiiClient property: Data type for TAXII connector.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TiTaxiiDataConnectorDataTypesTaxiiClient.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TiTaxiiDataConnectorDataTypesTaxiiClient.java
index 7b2b40b0a648..07402e5313ca 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TiTaxiiDataConnectorDataTypesTaxiiClient.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TiTaxiiDataConnectorDataTypesTaxiiClient.java
@@ -9,6 +9,10 @@
 /** Data type for TAXII connector. */
 @Fluent
 public final class TiTaxiiDataConnectorDataTypesTaxiiClient extends DataConnectorDataTypeCommon {
+    /** Creates an instance of TiTaxiiDataConnectorDataTypesTaxiiClient class. */
+    public TiTaxiiDataConnectorDataTypesTaxiiClient() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public TiTaxiiDataConnectorDataTypesTaxiiClient withState(DataTypeState state) {
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TimelineAggregation.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TimelineAggregation.java
index d34ece2d531a..49301c2fffb2 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TimelineAggregation.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TimelineAggregation.java
@@ -23,6 +23,10 @@ public final class TimelineAggregation {
     @JsonProperty(value = "kind", required = true)
     private EntityTimelineKind kind;
 
+    /** Creates an instance of TimelineAggregation class. */
+    public TimelineAggregation() {
+    }
+
     /**
      * Get the count property: the total items found for a kind.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TimelineError.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TimelineError.java
index e6c563cb369f..3deb6ab0b32e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TimelineError.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TimelineError.java
@@ -29,6 +29,10 @@ public final class TimelineError {
     @JsonProperty(value = "errorMessage", required = true)
     private String errorMessage;
 
+    /** Creates an instance of TimelineError class. */
+    public TimelineError() {
+    }
+
     /**
      * Get the kind property: the query kind.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TimelineResultsMetadata.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TimelineResultsMetadata.java
index 7d42bccca470..0e2fbed3b2ab 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TimelineResultsMetadata.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/TimelineResultsMetadata.java
@@ -30,6 +30,10 @@ public final class TimelineResultsMetadata {
     @JsonProperty(value = "errors")
     private List<TimelineError> errors;
 
+    /** Creates an instance of TimelineResultsMetadata class. */
+    public TimelineResultsMetadata() {
+    }
+
     /**
      * Get the totalCount property: the total items found for the timeline request.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Ueba.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Ueba.java
index 5a79fd502544..ca29e5d7ff22 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Ueba.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Ueba.java
@@ -23,6 +23,10 @@ public final class Ueba extends SettingsInner {
     @JsonProperty(value = "properties")
     private UebaProperties innerProperties;
 
+    /** Creates an instance of Ueba class. */
+    public Ueba() {
+    }
+
     /**
      * Get the innerProperties property: Ueba properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/UrlEntity.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/UrlEntity.java
index 0af80094b7e0..e8975502da54 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/UrlEntity.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/UrlEntity.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.securityinsights.models;
 
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
 import com.azure.resourcemanager.securityinsights.fluent.models.EntityInner;
 import com.azure.resourcemanager.securityinsights.fluent.models.UrlEntityProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -15,7 +15,7 @@
 /** Represents a url entity. */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
 @JsonTypeName("Url")
-@Fluent
+@Immutable
 public final class UrlEntity extends EntityInner {
     /*
      * Url entity properties
@@ -23,6 +23,10 @@ public final class UrlEntity extends EntityInner {
     @JsonProperty(value = "properties")
     private UrlEntityProperties innerProperties;
 
+    /** Creates an instance of UrlEntity class. */
+    public UrlEntity() {
+    }
+
     /**
      * Get the innerProperties property: Url entity properties.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/UserInfo.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/UserInfo.java
index 8d8dc55f0309..000883c8a5f3 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/UserInfo.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/UserInfo.java
@@ -29,6 +29,10 @@ public final class UserInfo {
     @JsonProperty(value = "objectId")
     private UUID objectId;
 
+    /** Creates an instance of UserInfo class. */
+    public UserInfo() {
+    }
+
     /**
      * Get the email property: The email of the user.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ValidationError.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ValidationError.java
index 7b74ced2e068..2a7a5066bdee 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ValidationError.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/ValidationError.java
@@ -23,6 +23,10 @@ public final class ValidationError {
     @JsonProperty(value = "errorMessages", access = JsonProperty.Access.WRITE_ONLY)
     private List<String> errorMessages;
 
+    /** Creates an instance of ValidationError class. */
+    public ValidationError() {
+    }
+
     /**
      * Get the recordIndex property: The number of the record that has the error.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WatchlistItemList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WatchlistItemList.java
index 97bc46f5f4bd..746fe1d8db21 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WatchlistItemList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WatchlistItemList.java
@@ -25,6 +25,10 @@ public final class WatchlistItemList {
     @JsonProperty(value = "value", required = true)
     private List<WatchlistItemInner> value;
 
+    /** Creates an instance of WatchlistItemList class. */
+    public WatchlistItemList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of watchlist item.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WatchlistItems.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WatchlistItems.java
index 9b56cdba2403..2c03a7964f81 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WatchlistItems.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WatchlistItems.java
@@ -48,12 +48,14 @@ PagedIterable<WatchlistItem> list(
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
      * @param watchlistItemId Watchlist Item Id (GUID).
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a watchlist, without its watchlist items.
+     * @return a watchlist, without its watchlist items along with {@link Response}.
      */
-    WatchlistItem get(String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId);
+    Response<WatchlistItem> getWithResponse(
+        String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId, Context context);
 
     /**
      * Gets a watchlist, without its watchlist items.
@@ -62,14 +64,12 @@ PagedIterable<WatchlistItem> list(
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
      * @param watchlistItemId Watchlist Item Id (GUID).
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a watchlist, without its watchlist items along with {@link Response}.
+     * @return a watchlist, without its watchlist items.
      */
-    Response<WatchlistItem> getWithResponse(
-        String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId, Context context);
+    WatchlistItem get(String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId);
 
     /**
      * Delete a watchlist item.
@@ -78,11 +78,14 @@ Response<WatchlistItem> getWithResponse(
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
      * @param watchlistItemId Watchlist Item Id (GUID).
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
      */
-    void delete(String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId);
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId, Context context);
 
     /**
      * Delete a watchlist item.
@@ -91,14 +94,11 @@ Response<WatchlistItem> getWithResponse(
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
      * @param watchlistItemId Watchlist Item Id (GUID).
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response}.
      */
-    Response<Void> deleteWithResponse(
-        String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId, Context context);
+    void delete(String resourceGroupName, String workspaceName, String watchlistAlias, String watchlistItemId);
 
     /**
      * Gets a watchlist, without its watchlist items.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WatchlistList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WatchlistList.java
index 4e03f77f637e..4c0e933d47db 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WatchlistList.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WatchlistList.java
@@ -25,6 +25,10 @@ public final class WatchlistList {
     @JsonProperty(value = "value", required = true)
     private List<WatchlistInner> value;
 
+    /** Creates an instance of WatchlistList class. */
+    public WatchlistList() {
+    }
+
     /**
      * Get the nextLink property: URL to fetch the next set of watchlists.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Watchlists.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Watchlists.java
index 4e53d746f064..026f4b39fa71 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Watchlists.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Watchlists.java
@@ -44,12 +44,14 @@ public interface Watchlists {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a watchlist, without its watchlist items.
+     * @return a watchlist, without its watchlist items along with {@link Response}.
      */
-    Watchlist get(String resourceGroupName, String workspaceName, String watchlistAlias);
+    Response<Watchlist> getWithResponse(
+        String resourceGroupName, String workspaceName, String watchlistAlias, Context context);
 
     /**
      * Gets a watchlist, without its watchlist items.
@@ -57,14 +59,12 @@ public interface Watchlists {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a watchlist, without its watchlist items along with {@link Response}.
+     * @return a watchlist, without its watchlist items.
      */
-    Response<Watchlist> getWithResponse(
-        String resourceGroupName, String workspaceName, String watchlistAlias, Context context);
+    Watchlist get(String resourceGroupName, String workspaceName, String watchlistAlias);
 
     /**
      * Delete a watchlist.
@@ -72,11 +72,14 @@ Response<Watchlist> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
      */
-    void delete(String resourceGroupName, String workspaceName, String watchlistAlias);
+    WatchlistsDeleteResponse deleteWithResponse(
+        String resourceGroupName, String workspaceName, String watchlistAlias, Context context);
 
     /**
      * Delete a watchlist.
@@ -84,14 +87,11 @@ Response<Watchlist> getWithResponse(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param workspaceName The name of the workspace.
      * @param watchlistAlias Watchlist Alias.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response.
      */
-    WatchlistsDeleteResponse deleteWithResponse(
-        String resourceGroupName, String workspaceName, String watchlistAlias, Context context);
+    void delete(String resourceGroupName, String workspaceName, String watchlistAlias);
 
     /**
      * Gets a watchlist, without its watchlist items.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Webhook.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Webhook.java
index 8495bcf9e510..d1be4d11642a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Webhook.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/Webhook.java
@@ -34,6 +34,10 @@ public final class Webhook {
     @JsonProperty(value = "rotateWebhookSecret")
     private Boolean rotateWebhookSecret;
 
+    /** Creates an instance of Webhook class. */
+    public Webhook() {
+    }
+
     /**
      * Get the webhookId property: Unique identifier for the webhook.
      *
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WorkspaceManagerConfiguration.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WorkspaceManagerConfiguration.java
new file mode 100644
index 000000000000..68e36df7f9d0
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WorkspaceManagerConfiguration.java
@@ -0,0 +1,172 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.models;
+
+import com.azure.core.management.SystemData;
+import com.azure.core.util.Context;
+import com.azure.resourcemanager.securityinsights.fluent.models.WorkspaceManagerConfigurationInner;
+
+/** An immutable client-side representation of WorkspaceManagerConfiguration. */
+public interface WorkspaceManagerConfiguration {
+    /**
+     * Gets the id property: Fully qualified resource Id for the resource.
+     *
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * Gets the name property: The name of the resource.
+     *
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * Gets the type property: The type of the resource.
+     *
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * Gets the etag property: Resource Etag.
+     *
+     * @return the etag value.
+     */
+    String etag();
+
+    /**
+     * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     *
+     * @return the systemData value.
+     */
+    SystemData systemData();
+
+    /**
+     * Gets the mode property: The current mode of the workspace manager configuration.
+     *
+     * @return the mode value.
+     */
+    Mode mode();
+
+    /**
+     * Gets the name of the resource group.
+     *
+     * @return the name of the resource group.
+     */
+    String resourceGroupName();
+
+    /**
+     * Gets the inner com.azure.resourcemanager.securityinsights.fluent.models.WorkspaceManagerConfigurationInner
+     * object.
+     *
+     * @return the inner object.
+     */
+    WorkspaceManagerConfigurationInner innerModel();
+
+    /** The entirety of the WorkspaceManagerConfiguration definition. */
+    interface Definition
+        extends DefinitionStages.Blank, DefinitionStages.WithParentResource, DefinitionStages.WithCreate {
+    }
+    /** The WorkspaceManagerConfiguration definition stages. */
+    interface DefinitionStages {
+        /** The first stage of the WorkspaceManagerConfiguration definition. */
+        interface Blank extends WithParentResource {
+        }
+        /** The stage of the WorkspaceManagerConfiguration definition allowing to specify parent resource. */
+        interface WithParentResource {
+            /**
+             * Specifies resourceGroupName, workspaceName.
+             *
+             * @param resourceGroupName The name of the resource group. The name is case insensitive.
+             * @param workspaceName The name of the workspace.
+             * @return the next definition stage.
+             */
+            WithCreate withExistingWorkspace(String resourceGroupName, String workspaceName);
+        }
+        /**
+         * The stage of the WorkspaceManagerConfiguration definition which contains all the minimum required properties
+         * for the resource to be created, but also allows for any other optional properties to be specified.
+         */
+        interface WithCreate extends DefinitionStages.WithMode {
+            /**
+             * Executes the create request.
+             *
+             * @return the created resource.
+             */
+            WorkspaceManagerConfiguration create();
+
+            /**
+             * Executes the create request.
+             *
+             * @param context The context to associate with this operation.
+             * @return the created resource.
+             */
+            WorkspaceManagerConfiguration create(Context context);
+        }
+        /** The stage of the WorkspaceManagerConfiguration definition allowing to specify mode. */
+        interface WithMode {
+            /**
+             * Specifies the mode property: The current mode of the workspace manager configuration.
+             *
+             * @param mode The current mode of the workspace manager configuration.
+             * @return the next definition stage.
+             */
+            WithCreate withMode(Mode mode);
+        }
+    }
+    /**
+     * Begins update for the WorkspaceManagerConfiguration resource.
+     *
+     * @return the stage of resource update.
+     */
+    WorkspaceManagerConfiguration.Update update();
+
+    /** The template for WorkspaceManagerConfiguration update. */
+    interface Update extends UpdateStages.WithMode {
+        /**
+         * Executes the update request.
+         *
+         * @return the updated resource.
+         */
+        WorkspaceManagerConfiguration apply();
+
+        /**
+         * Executes the update request.
+         *
+         * @param context The context to associate with this operation.
+         * @return the updated resource.
+         */
+        WorkspaceManagerConfiguration apply(Context context);
+    }
+    /** The WorkspaceManagerConfiguration update stages. */
+    interface UpdateStages {
+        /** The stage of the WorkspaceManagerConfiguration update allowing to specify mode. */
+        interface WithMode {
+            /**
+             * Specifies the mode property: The current mode of the workspace manager configuration.
+             *
+             * @param mode The current mode of the workspace manager configuration.
+             * @return the next definition stage.
+             */
+            Update withMode(Mode mode);
+        }
+    }
+    /**
+     * Refreshes the resource to sync with Azure.
+     *
+     * @return the refreshed resource.
+     */
+    WorkspaceManagerConfiguration refresh();
+
+    /**
+     * Refreshes the resource to sync with Azure.
+     *
+     * @param context The context to associate with this operation.
+     * @return the refreshed resource.
+     */
+    WorkspaceManagerConfiguration refresh(Context context);
+}
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WorkspaceManagerConfigurationList.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WorkspaceManagerConfigurationList.java
new file mode 100644
index 000000000000..f612c2509063
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WorkspaceManagerConfigurationList.java
@@ -0,0 +1,78 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.resourcemanager.securityinsights.fluent.models.WorkspaceManagerConfigurationInner;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+/** List all the workspace manager configurations for the workspace. */
+@Fluent
+public final class WorkspaceManagerConfigurationList {
+    /*
+     * URL to fetch the next set of workspace manager configurations.
+     */
+    @JsonProperty(value = "nextLink", access = JsonProperty.Access.WRITE_ONLY)
+    private String nextLink;
+
+    /*
+     * Array of workspace manager configurations.
+     */
+    @JsonProperty(value = "value", required = true)
+    private List<WorkspaceManagerConfigurationInner> value;
+
+    /** Creates an instance of WorkspaceManagerConfigurationList class. */
+    public WorkspaceManagerConfigurationList() {
+    }
+
+    /**
+     * Get the nextLink property: URL to fetch the next set of workspace manager configurations.
+     *
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Get the value property: Array of workspace manager configurations.
+     *
+     * @return the value value.
+     */
+    public List<WorkspaceManagerConfigurationInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value property: Array of workspace manager configurations.
+     *
+     * @param value the value value to set.
+     * @return the WorkspaceManagerConfigurationList object itself.
+     */
+    public WorkspaceManagerConfigurationList withValue(List<WorkspaceManagerConfigurationInner> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     *
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (value() == null) {
+            throw LOGGER
+                .logExceptionAsError(
+                    new IllegalArgumentException(
+                        "Missing required property value in model WorkspaceManagerConfigurationList"));
+        } else {
+            value().forEach(e -> e.validate());
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(WorkspaceManagerConfigurationList.class);
+}
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WorkspaceManagerConfigurations.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WorkspaceManagerConfigurations.java
new file mode 100644
index 000000000000..dbbb6d43b9d0
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/WorkspaceManagerConfigurations.java
@@ -0,0 +1,154 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.models;
+
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.util.Context;
+
+/** Resource collection API of WorkspaceManagerConfigurations. */
+public interface WorkspaceManagerConfigurations {
+    /**
+     * Gets all workspace manager configurations for a Sentinel workspace.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return all workspace manager configurations for a Sentinel workspace as paginated response with {@link
+     *     PagedIterable}.
+     */
+    PagedIterable<WorkspaceManagerConfiguration> list(String resourceGroupName, String workspaceName);
+
+    /**
+     * Gets all workspace manager configurations for a Sentinel workspace.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param orderby Sorts the results. Optional.
+     * @param top Returns only the first n results. Optional.
+     * @param skipToken Skiptoken is only used if a previous operation returned a partial result. If a previous response
+     *     contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that
+     *     specifies a starting point to use for subsequent calls. Optional.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return all workspace manager configurations for a Sentinel workspace as paginated response with {@link
+     *     PagedIterable}.
+     */
+    PagedIterable<WorkspaceManagerConfiguration> list(
+        String resourceGroupName, String workspaceName, String orderby, Integer top, String skipToken, Context context);
+
+    /**
+     * Gets a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a workspace manager configuration along with {@link Response}.
+     */
+    Response<WorkspaceManagerConfiguration> getWithResponse(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName, Context context);
+
+    /**
+     * Gets a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a workspace manager configuration.
+     */
+    WorkspaceManagerConfiguration get(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName);
+
+    /**
+     * Deletes a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
+     */
+    Response<Void> deleteWithResponse(
+        String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName, Context context);
+
+    /**
+     * Deletes a workspace manager configuration.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param workspaceName The name of the workspace.
+     * @param workspaceManagerConfigurationName The name of the workspace manager configuration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void delete(String resourceGroupName, String workspaceName, String workspaceManagerConfigurationName);
+
+    /**
+     * Gets a workspace manager configuration.
+     *
+     * @param id the resource ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a workspace manager configuration along with {@link Response}.
+     */
+    WorkspaceManagerConfiguration getById(String id);
+
+    /**
+     * Gets a workspace manager configuration.
+     *
+     * @param id the resource ID.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a workspace manager configuration along with {@link Response}.
+     */
+    Response<WorkspaceManagerConfiguration> getByIdWithResponse(String id, Context context);
+
+    /**
+     * Deletes a workspace manager configuration.
+     *
+     * @param id the resource ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void deleteById(String id);
+
+    /**
+     * Deletes a workspace manager configuration.
+     *
+     * @param id the resource ID.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
+     */
+    Response<Void> deleteByIdWithResponse(String id, Context context);
+
+    /**
+     * Begins definition for a new WorkspaceManagerConfiguration resource.
+     *
+     * @param name resource name.
+     * @return the first stage of the new WorkspaceManagerConfiguration definition.
+     */
+    WorkspaceManagerConfiguration.DefinitionStages.Blank define(String name);
+}
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ActionsCreateOrUpdateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ActionsCreateOrUpdateSamples.java
index 68e39f44ac62..56be6510079f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ActionsCreateOrUpdateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ActionsCreateOrUpdateSamples.java
@@ -7,7 +7,7 @@
 /** Samples for Actions CreateOrUpdate. */
 public final class ActionsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/actions/CreateActionOfAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/actions/CreateActionOfAlertRule.json
      */
     /**
      * Sample code: Creates or updates an action of alert rule.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ActionsDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ActionsDeleteSamples.java
index 4eade4f80487..f9005cd0f4d7 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ActionsDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ActionsDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Actions Delete. */
 public final class ActionsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/actions/DeleteActionOfAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/actions/DeleteActionOfAlertRule.json
      */
     /**
      * Sample code: Delete an action of alert rule.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ActionsGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ActionsGetSamples.java
index 3d2f9a3fcd1a..bee4b0ede490 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ActionsGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ActionsGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Actions Get. */
 public final class ActionsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/actions/GetActionOfAlertRuleById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/actions/GetActionOfAlertRuleById.json
      */
     /**
      * Sample code: Get an action of alert rule.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ActionsListByAlertRuleSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ActionsListByAlertRuleSamples.java
index 61efbd321ea9..ee9b7c6617ba 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ActionsListByAlertRuleSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ActionsListByAlertRuleSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Actions ListByAlertRule. */
 public final class ActionsListByAlertRuleSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/actions/GetAllActionsByAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/actions/GetAllActionsByAlertRule.json
      */
     /**
      * Sample code: Get all actions of alert rule.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRuleTemplatesGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRuleTemplatesGetSamples.java
index 5e2ef04f866c..029863cfe59e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRuleTemplatesGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRuleTemplatesGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for AlertRuleTemplates Get. */
 public final class AlertRuleTemplatesGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRuleTemplates/GetAlertRuleTemplateById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRuleTemplates/GetAlertRuleTemplateById.json
      */
     /**
      * Sample code: Get alert rule template by Id.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRuleTemplatesListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRuleTemplatesListSamples.java
index 30931adbd1bb..e1428ff980fc 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRuleTemplatesListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRuleTemplatesListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for AlertRuleTemplates List. */
 public final class AlertRuleTemplatesListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRuleTemplates/GetAlertRuleTemplates.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRuleTemplates/GetAlertRuleTemplates.json
      */
     /**
      * Sample code: Get all alert rule templates.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRulesCreateOrUpdateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRulesCreateOrUpdateSamples.java
index df3209f52c0c..f589e13552da 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRulesCreateOrUpdateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRulesCreateOrUpdateSamples.java
@@ -7,6 +7,8 @@
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.securityinsights.models.AlertDetail;
 import com.azure.resourcemanager.securityinsights.models.AlertDetailsOverride;
+import com.azure.resourcemanager.securityinsights.models.AlertProperty;
+import com.azure.resourcemanager.securityinsights.models.AlertPropertyMapping;
 import com.azure.resourcemanager.securityinsights.models.AlertSeverity;
 import com.azure.resourcemanager.securityinsights.models.AttackTactic;
 import com.azure.resourcemanager.securityinsights.models.EntityMapping;
@@ -26,6 +28,7 @@
 import com.azure.resourcemanager.securityinsights.models.MicrosoftSecurityProductName;
 import com.azure.resourcemanager.securityinsights.models.NrtAlertRule;
 import com.azure.resourcemanager.securityinsights.models.ScheduledAlertRule;
+import com.azure.resourcemanager.securityinsights.models.SentinelEntityMapping;
 import com.azure.resourcemanager.securityinsights.models.TriggerOperator;
 import java.time.Duration;
 import java.util.Arrays;
@@ -35,7 +38,7 @@
 /** Samples for AlertRules CreateOrUpdate. */
 public final class AlertRulesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/CreateFusionAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/CreateFusionAlertRule.json
      */
     /**
      * Sample code: Creates or updates a Fusion alert rule.
@@ -258,7 +261,7 @@ public static void createsOrUpdatesAFusionAlertRule(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/CreateMicrosoftSecurityIncidentCreationAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/CreateMicrosoftSecurityIncidentCreationAlertRule.json
      */
     /**
      * Sample code: Creates or updates a MicrosoftSecurityIncidentCreation rule.
@@ -282,7 +285,7 @@ public static void createsOrUpdatesAMicrosoftSecurityIncidentCreationRule(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/CreateScheduledAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/CreateScheduledAlertRule.json
      */
     /**
      * Sample code: Creates or updates a Scheduled alert rule.
@@ -350,12 +353,26 @@ public static void createsOrUpdatesAScheduledAlertRule(
                     .withAlertDetailsOverride(
                         new AlertDetailsOverride()
                             .withAlertDisplayNameFormat("Alert from {{Computer}}")
-                            .withAlertDescriptionFormat("Suspicious activity was made by {{ComputerIP}}")),
+                            .withAlertDescriptionFormat("Suspicious activity was made by {{ComputerIP}}")
+                            .withAlertDynamicProperties(
+                                Arrays
+                                    .asList(
+                                        new AlertPropertyMapping()
+                                            .withAlertProperty(AlertProperty.PRODUCT_COMPONENT_NAME)
+                                            .withValue("ProductComponentNameCustomColumn"),
+                                        new AlertPropertyMapping()
+                                            .withAlertProperty(AlertProperty.PRODUCT_NAME)
+                                            .withValue("ProductNameCustomColumn"),
+                                        new AlertPropertyMapping()
+                                            .withAlertProperty(AlertProperty.ALERT_LINK)
+                                            .withValue("Link"))))
+                    .withSentinelEntitiesMappings(
+                        Arrays.asList(new SentinelEntityMapping().withColumnName("Entities"))),
                 Context.NONE);
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/CreateFusionAlertRuleWithFusionScenarioExclusion.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/CreateFusionAlertRuleWithFusionScenarioExclusion.json
      */
     /**
      * Sample code: Creates or updates a Fusion alert rule with scenario exclusion pattern.
@@ -578,7 +595,7 @@ public static void createsOrUpdatesAFusionAlertRuleWithScenarioExclusionPattern(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/CreateNrtAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/CreateNrtAlertRule.json
      */
     /**
      * Sample code: Creates or updates a Nrt alert rule.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRulesDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRulesDeleteSamples.java
index ae8c5d352789..bd73f13d7c2a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRulesDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRulesDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for AlertRules Delete. */
 public final class AlertRulesDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/DeleteAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/DeleteAlertRule.json
      */
     /**
      * Sample code: Delete an alert rule.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRulesGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRulesGetSamples.java
index 5f59cda357eb..99578c21fbfa 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRulesGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRulesGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for AlertRules Get. */
 public final class AlertRulesGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/GetScheduledAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/GetScheduledAlertRule.json
      */
     /**
      * Sample code: Get a Scheduled alert rule.
@@ -24,7 +24,7 @@ public static void getAScheduledAlertRule(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/GetNrtAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/GetNrtAlertRule.json
      */
     /**
      * Sample code: Get an Nrt alert rule.
@@ -38,7 +38,7 @@ public static void getAnNrtAlertRule(com.azure.resourcemanager.securityinsights.
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/GetFusionAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/GetFusionAlertRule.json
      */
     /**
      * Sample code: Get a Fusion alert rule.
@@ -50,7 +50,7 @@ public static void getAFusionAlertRule(com.azure.resourcemanager.securityinsight
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/GetMicrosoftSecurityIncidentCreationAlertRule.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/GetMicrosoftSecurityIncidentCreationAlertRule.json
      */
     /**
      * Sample code: Get a MicrosoftSecurityIncidentCreation rule.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRulesListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRulesListSamples.java
index a76a803ecb34..39a41d85b8c2 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRulesListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AlertRulesListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for AlertRules List. */
 public final class AlertRulesListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/alertRules/GetAllAlertRules.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/alertRules/GetAllAlertRules.json
      */
     /**
      * Sample code: Get all alert rules.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AutomationRulesCreateOrUpdateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AutomationRulesCreateOrUpdateSamples.java
index 0ddbba866ce2..2846769c9198 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AutomationRulesCreateOrUpdateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AutomationRulesCreateOrUpdateSamples.java
@@ -11,7 +11,7 @@
 /** Samples for AutomationRules CreateOrUpdate. */
 public final class AutomationRulesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/automationRules/AutomationRules_CreateOrUpdate.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/automationRules/AutomationRules_CreateOrUpdate.json
      */
     /**
      * Sample code: AutomationRules_CreateOrUpdate.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AutomationRulesDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AutomationRulesDeleteSamples.java
index 9931b428f993..7471402d5964 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AutomationRulesDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AutomationRulesDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for AutomationRules Delete. */
 public final class AutomationRulesDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/automationRules/AutomationRules_Delete.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/automationRules/AutomationRules_Delete.json
      */
     /**
      * Sample code: AutomationRules_Delete.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AutomationRulesGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AutomationRulesGetSamples.java
index 79bd1f2bf1dd..cf2402a32744 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AutomationRulesGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AutomationRulesGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for AutomationRules Get. */
 public final class AutomationRulesGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/automationRules/AutomationRules_Get.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/automationRules/AutomationRules_Get.json
      */
     /**
      * Sample code: AutomationRules_Get.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AutomationRulesListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AutomationRulesListSamples.java
index cb067a4161d2..2406ab50a95a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AutomationRulesListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/AutomationRulesListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for AutomationRules List. */
 public final class AutomationRulesListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/automationRules/AutomationRules_List.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/automationRules/AutomationRules_List.json
      */
     /**
      * Sample code: AutomationRules_List.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkOperationExpandSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkOperationExpandSamples.java
index 02135e4b1f24..d49b7c096c2a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkOperationExpandSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkOperationExpandSamples.java
@@ -12,7 +12,7 @@
 /** Samples for BookmarkOperation Expand. */
 public final class BookmarkOperationExpandSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/expand/PostExpandBookmark.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/expand/PostExpandBookmark.json
      */
     /**
      * Sample code: Expand an bookmark.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkRelationsCreateOrUpdateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkRelationsCreateOrUpdateSamples.java
index 4ee602ef802a..9a03361a5be0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkRelationsCreateOrUpdateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkRelationsCreateOrUpdateSamples.java
@@ -7,7 +7,7 @@
 /** Samples for BookmarkRelations CreateOrUpdate. */
 public final class BookmarkRelationsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/relations/CreateBookmarkRelation.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/relations/CreateBookmarkRelation.json
      */
     /**
      * Sample code: Creates or updates a bookmark relation.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkRelationsDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkRelationsDeleteSamples.java
index 90fe86d803f0..f347788d5ad9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkRelationsDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkRelationsDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for BookmarkRelations Delete. */
 public final class BookmarkRelationsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/relations/DeleteBookmarkRelation.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/relations/DeleteBookmarkRelation.json
      */
     /**
      * Sample code: Delete the bookmark relation.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkRelationsGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkRelationsGetSamples.java
index 6ae73ac9318f..7af418a47f1d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkRelationsGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkRelationsGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for BookmarkRelations Get. */
 public final class BookmarkRelationsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/relations/GetBookmarkRelationByName.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/relations/GetBookmarkRelationByName.json
      */
     /**
      * Sample code: Get a bookmark relation.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkRelationsListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkRelationsListSamples.java
index c04cb45847c2..733e82153b34 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkRelationsListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarkRelationsListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for BookmarkRelations List. */
 public final class BookmarkRelationsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/relations/GetAllBookmarkRelations.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/relations/GetAllBookmarkRelations.json
      */
     /**
      * Sample code: Get all bookmark relations.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarksCreateOrUpdateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarksCreateOrUpdateSamples.java
index f54f13ae59da..2f042d308e0d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarksCreateOrUpdateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarksCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
 /** Samples for Bookmarks CreateOrUpdate. */
 public final class BookmarksCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/CreateBookmark.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/CreateBookmark.json
      */
     /**
      * Sample code: Creates or updates a bookmark.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarksDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarksDeleteSamples.java
index adaf45b1a342..0d5b1f5939e3 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarksDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarksDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Bookmarks Delete. */
 public final class BookmarksDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/DeleteBookmark.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/DeleteBookmark.json
      */
     /**
      * Sample code: Delete a bookmark.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarksGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarksGetSamples.java
index cca078fc516b..bad03525c022 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarksGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarksGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Bookmarks Get. */
 public final class BookmarksGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/GetBookmarkById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/GetBookmarkById.json
      */
     /**
      * Sample code: Get a bookmark.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarksListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarksListSamples.java
index 7ff9e9471b73..e3528bbd02c4 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarksListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/BookmarksListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Bookmarks List. */
 public final class BookmarksListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/bookmarks/GetBookmarks.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/bookmarks/GetBookmarks.json
      */
     /**
      * Sample code: Get all bookmarks.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsCheckRequirementsOperationPostSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsCheckRequirementsOperationPostSamples.java
index 236b908d0955..d2d3f85af5c5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsCheckRequirementsOperationPostSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsCheckRequirementsOperationPostSamples.java
@@ -22,7 +22,7 @@
 /** Samples for DataConnectorsCheckRequirementsOperation Post. */
 public final class DataConnectorsCheckRequirementsOperationPostSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsOfficeATP.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsOfficeATP.json
      */
     /**
      * Sample code: Check requirements for OfficeATP.
@@ -37,7 +37,7 @@ public static void checkRequirementsForOfficeATP(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsOffice365Project.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsOffice365Project.json
      */
     /**
      * Sample code: Check requirements for Office365Project.
@@ -52,7 +52,7 @@ public static void checkRequirementsForOffice365Project(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json
      */
     /**
      * Sample code: Check requirements for AAD.
@@ -67,7 +67,7 @@ public static void checkRequirementsForAAD(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json
      */
     /**
      * Sample code: Check requirements for Mcas.
@@ -82,7 +82,7 @@ public static void checkRequirementsForMcas(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsIoT.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsIoT.json
      */
     /**
      * Sample code: Check requirements for IoT.
@@ -101,7 +101,7 @@ public static void checkRequirementsForIoT(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json
      */
     /**
      * Sample code: Check requirements for Mdatp.
@@ -116,7 +116,7 @@ public static void checkRequirementsForMdatp(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json
      */
     /**
      * Sample code: Check requirements for AAD - no authorization.
@@ -131,7 +131,7 @@ public static void checkRequirementsForAADNoAuthorization(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json
      */
     /**
      * Sample code: Check requirements for ASC.
@@ -150,7 +150,7 @@ public static void checkRequirementsForASC(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftThreatProtection.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftThreatProtection.json
      */
     /**
      * Sample code: Check requirements for MicrosoftThreatProtection.
@@ -165,7 +165,7 @@ public static void checkRequirementsForMicrosoftThreatProtection(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligenceTaxii.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligenceTaxii.json
      */
     /**
      * Sample code: Check requirements for TI Taxii.
@@ -180,7 +180,7 @@ public static void checkRequirementsForTITaxii(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsOfficeIRM.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsOfficeIRM.json
      */
     /**
      * Sample code: Check requirements for OfficeIRM.
@@ -195,7 +195,7 @@ public static void checkRequirementsForOfficeIRM(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftThreatIntelligence.json
      */
     /**
      * Sample code: Check requirements for MicrosoftThreatIntelligence.
@@ -210,7 +210,7 @@ public static void checkRequirementsForMicrosoftThreatIntelligence(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsOfficePowerBI.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsOfficePowerBI.json
      */
     /**
      * Sample code: Check requirements for OfficePowerBI.
@@ -225,7 +225,7 @@ public static void checkRequirementsForOfficePowerBI(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsDynamics365.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsDynamics365.json
      */
     /**
      * Sample code: Check requirements for Dynamics365.
@@ -240,7 +240,7 @@ public static void checkRequirementsForDynamics365(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json
      */
     /**
      * Sample code: Check requirements for AAD - no license.
@@ -255,7 +255,7 @@ public static void checkRequirementsForAADNoLicense(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json
      */
     /**
      * Sample code: Check requirements for TI.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsConnectSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsConnectSamples.java
index 3754a2ecfb7a..95c2d46db185 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsConnectSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsConnectSamples.java
@@ -15,7 +15,7 @@
 /** Samples for DataConnectors Connect. */
 public final class DataConnectorsConnectSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/ConnectAPIPollingV2Logs.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/ConnectAPIPollingV2Logs.json
      */
     /**
      * Sample code: Connect an APIPolling V2 logs data connector.
@@ -50,7 +50,7 @@ public static void connectAnAPIPollingV2LogsDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/ConnectAPIPolling.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/ConnectAPIPolling.json
      */
     /**
      * Sample code: Connect an APIPolling data connector.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsCreateOrUpdateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsCreateOrUpdateSamples.java
index 8a4b352fb274..946466ecbab4 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsCreateOrUpdateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsCreateOrUpdateSamples.java
@@ -60,7 +60,7 @@
 /** Samples for DataConnectors CreateOrUpdate. */
 public final class DataConnectorsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CreateOfficeDataConnetor.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CreateOfficeDataConnetor.json
      */
     /**
      * Sample code: Creates or updates an Office365 data connector.
@@ -88,7 +88,7 @@ public static void createsOrUpdatesAnOffice365DataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CreateOfficePowerBIDataConnector.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CreateOfficePowerBIDataConnector.json
      */
     /**
      * Sample code: Creates or updates an Office PowerBI data connector.
@@ -113,7 +113,7 @@ public static void createsOrUpdatesAnOfficePowerBIDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CreateThreatIntelligenceTaxiiDataConnector.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CreateThreatIntelligenceTaxiiDataConnector.json
      */
     /**
      * Sample code: Creates or updates a Threat Intelligence Taxii data connector.
@@ -147,7 +147,7 @@ public static void createsOrUpdatesAThreatIntelligenceTaxiiDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CreateThreatIntelligenceDataConnector.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CreateThreatIntelligenceDataConnector.json
      */
     /**
      * Sample code: Creates or updates an Threat Intelligence Platform data connector.
@@ -172,7 +172,7 @@ public static void createsOrUpdatesAnThreatIntelligencePlatformDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CreateDynamics365DataConnetor.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CreateDynamics365DataConnetor.json
      */
     /**
      * Sample code: Creates or updates a Dynamics365 data connector.
@@ -199,7 +199,7 @@ public static void createsOrUpdatesADynamics365DataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CreateGenericUI.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CreateGenericUI.json
      */
     /**
      * Sample code: Creates or updates a GenericUI data connector.
@@ -519,7 +519,7 @@ public static void createsOrUpdatesAGenericUIDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CreateOffice365ProjectDataConnetor.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CreateOffice365ProjectDataConnetor.json
      */
     /**
      * Sample code: Creates or updates an Office365 Project data connector.
@@ -544,7 +544,7 @@ public static void createsOrUpdatesAnOffice365ProjectDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/CreateAPIPolling.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/CreateAPIPolling.json
      */
     /**
      * Sample code: Creates or updates a APIPolling data connector.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsDeleteSamples.java
index 54ce6d4bb0bc..dea457c5ef50 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for DataConnectors Delete. */
 public final class DataConnectorsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/DeleteOffice365ProjectDataConnetor.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/DeleteOffice365ProjectDataConnetor.json
      */
     /**
      * Sample code: Delete an Office365 Project data connector.
@@ -24,7 +24,7 @@ public static void deleteAnOffice365ProjectDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/DeleteGenericUI.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/DeleteGenericUI.json
      */
     /**
      * Sample code: Delete a GenericUI data connector.
@@ -39,7 +39,7 @@ public static void deleteAGenericUIDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/DeleteOfficeDataConnetor.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/DeleteOfficeDataConnetor.json
      */
     /**
      * Sample code: Delete an Office365 data connector.
@@ -54,7 +54,7 @@ public static void deleteAnOffice365DataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/DeleteOfficePowerBIDataConnetor.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/DeleteOfficePowerBIDataConnetor.json
      */
     /**
      * Sample code: Delete an Office PowerBI data connector.
@@ -69,7 +69,7 @@ public static void deleteAnOfficePowerBIDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/DeleteAPIPolling.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/DeleteAPIPolling.json
      */
     /**
      * Sample code: Delete a APIPolling data connector.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsDisconnectSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsDisconnectSamples.java
index b9727cf73d26..30a28a395ebc 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsDisconnectSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsDisconnectSamples.java
@@ -9,7 +9,7 @@
 /** Samples for DataConnectors Disconnect. */
 public final class DataConnectorsDisconnectSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/DisconnectAPIPolling.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/DisconnectAPIPolling.json
      */
     /**
      * Sample code: Disconnect an APIPolling data connector.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsGetSamples.java
index 4e229927f6b9..e793bb7cc255 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for DataConnectors Get. */
 public final class DataConnectorsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetOffice365ProjectDataConnetorById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetOffice365ProjectDataConnetorById.json
      */
     /**
      * Sample code: Get an Office365 Project data connector.
@@ -24,7 +24,7 @@ public static void getAnOffice365ProjectDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetGenericUI.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetGenericUI.json
      */
     /**
      * Sample code: Get a GenericUI data connector.
@@ -39,7 +39,7 @@ public static void getAGenericUIDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetOffice365AdvancedThreatProtectionById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetOffice365AdvancedThreatProtectionById.json
      */
     /**
      * Sample code: Get an Office ATP data connector.
@@ -54,7 +54,7 @@ public static void getAnOfficeATPDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetIoTById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetIoTById.json
      */
     /**
      * Sample code: Get a IoT data connector.
@@ -69,7 +69,7 @@ public static void getAIoTDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetMicrosoftCloudAppSecurityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetMicrosoftCloudAppSecurityById.json
      */
     /**
      * Sample code: Get a MCAS data connector.
@@ -84,7 +84,7 @@ public static void getAMCASDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetThreatIntelligenceTaxiiById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetThreatIntelligenceTaxiiById.json
      */
     /**
      * Sample code: Get a TI Taxii data connector.
@@ -99,7 +99,7 @@ public static void getATITaxiiDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetMicrosoftThreatIntelligenceById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetMicrosoftThreatIntelligenceById.json
      */
     /**
      * Sample code: Get a MicrosoftThreatIntelligence data connector.
@@ -114,7 +114,7 @@ public static void getAMicrosoftThreatIntelligenceDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetAzureSecurityCenterById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetAzureSecurityCenterById.json
      */
     /**
      * Sample code: Get a ASC data connector.
@@ -129,7 +129,7 @@ public static void getAASCDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetThreatIntelligenceById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetThreatIntelligenceById.json
      */
     /**
      * Sample code: Get a TI data connector.
@@ -143,7 +143,7 @@ public static void getATIDataConnector(com.azure.resourcemanager.securityinsight
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetAmazonWebServicesCloudTrailById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetAmazonWebServicesCloudTrailById.json
      */
     /**
      * Sample code: Get an AwsCloudTrail data connector.
@@ -158,7 +158,7 @@ public static void getAnAwsCloudTrailDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetMicrosoftDefenderAdvancedThreatProtectionById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetMicrosoftDefenderAdvancedThreatProtectionById.json
      */
     /**
      * Sample code: Get a MDATP data connector.
@@ -173,7 +173,7 @@ public static void getAMDATPDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetMicrosoftThreatProtectionById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetMicrosoftThreatProtectionById.json
      */
     /**
      * Sample code: Get a MicrosoftThreatProtection data connector.
@@ -188,7 +188,7 @@ public static void getAMicrosoftThreatProtectionDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetAzureActiveDirectoryById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetAzureActiveDirectoryById.json
      */
     /**
      * Sample code: Get an AAD data connector.
@@ -203,7 +203,7 @@ public static void getAnAADDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetAzureAdvancedThreatProtectionById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetAzureAdvancedThreatProtectionById.json
      */
     /**
      * Sample code: Get an AATP data connector.
@@ -218,7 +218,7 @@ public static void getAnAATPDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetAPIPolling.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetAPIPolling.json
      */
     /**
      * Sample code: Get a APIPolling data connector.
@@ -233,7 +233,7 @@ public static void getAAPIPollingDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetMicrosoftInsiderRiskManagementById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetMicrosoftInsiderRiskManagementById.json
      */
     /**
      * Sample code: Get an Office IRM data connector.
@@ -248,7 +248,7 @@ public static void getAnOfficeIRMDataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetDynamics365DataConnectorById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetDynamics365DataConnectorById.json
      */
     /**
      * Sample code: Get a Dynamics365 data connector.
@@ -263,7 +263,7 @@ public static void getADynamics365DataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetOfficeDataConnetorById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetOfficeDataConnetorById.json
      */
     /**
      * Sample code: Get an Office365 data connector.
@@ -278,7 +278,7 @@ public static void getAnOffice365DataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetAmazonWebServicesS3ById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetAmazonWebServicesS3ById.json
      */
     /**
      * Sample code: Get an Aws S3 data connector.
@@ -293,7 +293,7 @@ public static void getAnAwsS3DataConnector(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetOfficePowerBIDataConnetorById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetOfficePowerBIDataConnetorById.json
      */
     /**
      * Sample code: Get an Office365 PowerBI data connector.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsListSamples.java
index 962a0a285d9e..2a012f48245b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DataConnectorsListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for DataConnectors List. */
 public final class DataConnectorsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/dataConnectors/GetDataConnectors.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/dataConnectors/GetDataConnectors.json
      */
     /**
      * Sample code: Get all data connectors.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DomainWhoisGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DomainWhoisGetSamples.java
index 0bb699a3decd..a5f9623d3d8f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DomainWhoisGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/DomainWhoisGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for DomainWhois Get. */
 public final class DomainWhoisGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/enrichment/GetWhoisByDomainName.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/enrichment/GetWhoisByDomainName.json
      */
     /**
      * Sample code: Get whois information for a single domain name.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesExpandSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesExpandSamples.java
index c18a6971c401..21a0ffb9bbf9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesExpandSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesExpandSamples.java
@@ -12,7 +12,7 @@
 /** Samples for Entities Expand. */
 public final class EntitiesExpandSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/expand/PostExpandEntity.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/expand/PostExpandEntity.json
      */
     /**
      * Sample code: Expand an entity.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesGetInsightsSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesGetInsightsSamples.java
index 87a4794ab75b..9ab11653a0f4 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesGetInsightsSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesGetInsightsSamples.java
@@ -13,7 +13,7 @@
 /** Samples for Entities GetInsights. */
 public final class EntitiesGetInsightsSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/insights/PostGetInsights.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/insights/PostGetInsights.json
      */
     /**
      * Sample code: Entity Insight.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesGetSamples.java
index 03835df0aca6..d893b503b550 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Entities Get. */
 public final class EntitiesGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetSubmissionMailEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetSubmissionMailEntityById.json
      */
     /**
      * Sample code: Get a submissionMail entity.
@@ -22,7 +22,7 @@ public static void getASubmissionMailEntity(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetDnsEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetDnsEntityById.json
      */
     /**
      * Sample code: Get a dns entity.
@@ -34,7 +34,7 @@ public static void getADnsEntity(com.azure.resourcemanager.securityinsights.Secu
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetFileHashEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetFileHashEntityById.json
      */
     /**
      * Sample code: Get a file hash entity.
@@ -46,7 +46,7 @@ public static void getAFileHashEntity(com.azure.resourcemanager.securityinsights
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetIoTDeviceEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetIoTDeviceEntityById.json
      */
     /**
      * Sample code: Get an IoT device entity.
@@ -59,7 +59,7 @@ public static void getAnIoTDeviceEntity(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetRegistryKeyEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetRegistryKeyEntityById.json
      */
     /**
      * Sample code: Get a registry key entity.
@@ -72,7 +72,7 @@ public static void getARegistryKeyEntity(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetMailboxEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetMailboxEntityById.json
      */
     /**
      * Sample code: Get a mailbox entity.
@@ -84,7 +84,7 @@ public static void getAMailboxEntity(com.azure.resourcemanager.securityinsights.
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetMalwareEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetMalwareEntityById.json
      */
     /**
      * Sample code: Get a malware entity.
@@ -96,7 +96,7 @@ public static void getAMalwareEntity(com.azure.resourcemanager.securityinsights.
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetSecurityAlertEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetSecurityAlertEntityById.json
      */
     /**
      * Sample code: Get a security alert entity.
@@ -109,7 +109,7 @@ public static void getASecurityAlertEntity(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetIpEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetIpEntityById.json
      */
     /**
      * Sample code: Get an ip entity.
@@ -121,7 +121,7 @@ public static void getAnIpEntity(com.azure.resourcemanager.securityinsights.Secu
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetAccountEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetAccountEntityById.json
      */
     /**
      * Sample code: Get an account entity.
@@ -133,7 +133,7 @@ public static void getAnAccountEntity(com.azure.resourcemanager.securityinsights
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetCloudApplicationEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetCloudApplicationEntityById.json
      */
     /**
      * Sample code: Get a cloud application entity.
@@ -146,7 +146,7 @@ public static void getACloudApplicationEntity(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetFileEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetFileEntityById.json
      */
     /**
      * Sample code: Get a file entity.
@@ -158,7 +158,7 @@ public static void getAFileEntity(com.azure.resourcemanager.securityinsights.Sec
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetRegistryValueEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetRegistryValueEntityById.json
      */
     /**
      * Sample code: Get a registry value entity.
@@ -171,7 +171,7 @@ public static void getARegistryValueEntity(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetUrlEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetUrlEntityById.json
      */
     /**
      * Sample code: Get a url entity.
@@ -183,7 +183,7 @@ public static void getAUrlEntity(com.azure.resourcemanager.securityinsights.Secu
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetMailClusterEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetMailClusterEntityById.json
      */
     /**
      * Sample code: Get a mailCluster entity.
@@ -196,7 +196,7 @@ public static void getAMailClusterEntity(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetSecurityGroupEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetSecurityGroupEntityById.json
      */
     /**
      * Sample code: Get a security group entity.
@@ -209,7 +209,7 @@ public static void getASecurityGroupEntity(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetMailMessageEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetMailMessageEntityById.json
      */
     /**
      * Sample code: Get a mailMessage entity.
@@ -222,7 +222,7 @@ public static void getAMailMessageEntity(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetAzureResourceEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetAzureResourceEntityById.json
      */
     /**
      * Sample code: Get an azure resource entity.
@@ -235,7 +235,7 @@ public static void getAnAzureResourceEntity(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetHostEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetHostEntityById.json
      */
     /**
      * Sample code: Get a host entity.
@@ -247,7 +247,7 @@ public static void getAHostEntity(com.azure.resourcemanager.securityinsights.Sec
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetProcessEntityById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetProcessEntityById.json
      */
     /**
      * Sample code: Get a process entity.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesGetTimelineListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesGetTimelineListSamples.java
index 660a3055de2e..86c50ef6d844 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesGetTimelineListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesGetTimelineListSamples.java
@@ -11,7 +11,7 @@
 /** Samples for EntitiesGetTimeline List. */
 public final class EntitiesGetTimelineListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/timeline/PostTimelineEntity.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/timeline/PostTimelineEntity.json
      */
     /**
      * Sample code: Entity timeline.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesListSamples.java
index 76d03c406094..1d33eb191b0e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Entities List. */
 public final class EntitiesListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetEntities.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetEntities.json
      */
     /**
      * Sample code: Get all entities.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesQueriesSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesQueriesSamples.java
index a07e0a7b42bd..ff4a487ea5a9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesQueriesSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesQueriesSamples.java
@@ -10,7 +10,7 @@
 /** Samples for Entities Queries. */
 public final class EntitiesQueriesSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/GetQueries.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/GetQueries.json
      */
     /**
      * Sample code: Get Entity Query.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesRelationsListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesRelationsListSamples.java
index 49db6e77c5cc..5a8b6297b225 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesRelationsListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntitiesRelationsListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for EntitiesRelations List. */
 public final class EntitiesRelationsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/relations/GetAllEntityRelations.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/relations/GetAllEntityRelations.json
      */
     /**
      * Sample code: Get all relations of an entity.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueriesCreateOrUpdateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueriesCreateOrUpdateSamples.java
index 719027f63353..f909128d358f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueriesCreateOrUpdateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueriesCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
 /** Samples for EntityQueries CreateOrUpdate. */
 public final class EntityQueriesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entityQueries/CreateEntityQueryActivity.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entityQueries/CreateEntityQueryActivity.json
      */
     /**
      * Sample code: Creates or updates an Activity entity query.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueriesDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueriesDeleteSamples.java
index 9ca8ca1c3964..3ac133727f2f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueriesDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueriesDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for EntityQueries Delete. */
 public final class EntityQueriesDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entityQueries/DeleteEntityQuery.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entityQueries/DeleteEntityQuery.json
      */
     /**
      * Sample code: Delete an entity query.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueriesGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueriesGetSamples.java
index c5ddd58221cf..eac52767d4df 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueriesGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueriesGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for EntityQueries Get. */
 public final class EntityQueriesGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entityQueries/GetActivityEntityQueryById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entityQueries/GetActivityEntityQueryById.json
      */
     /**
      * Sample code: Get an Activity entity query.
@@ -24,7 +24,7 @@ public static void getAnActivityEntityQuery(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entityQueries/GetExpansionEntityQueryById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entityQueries/GetExpansionEntityQueryById.json
      */
     /**
      * Sample code: Get an Expansion entity query.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueriesListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueriesListSamples.java
index 3f319789b367..086ea275fecb 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueriesListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueriesListSamples.java
@@ -10,7 +10,7 @@
 /** Samples for EntityQueries List. */
 public final class EntityQueriesListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entityQueries/GetEntityQueries.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entityQueries/GetEntityQueries.json
      */
     /**
      * Sample code: Get all entity queries.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueryTemplatesGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueryTemplatesGetSamples.java
index 8e1290833c7a..85e6529f3aae 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueryTemplatesGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueryTemplatesGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for EntityQueryTemplates Get. */
 public final class EntityQueryTemplatesGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entityQueryTemplates/GetActivityEntityQueryTemplateById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entityQueryTemplates/GetActivityEntityQueryTemplateById.json
      */
     /**
      * Sample code: Get an Activity entity query template.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueryTemplatesListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueryTemplatesListSamples.java
index 4648fd151d8b..b05b621f2d0c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueryTemplatesListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityQueryTemplatesListSamples.java
@@ -5,12 +5,12 @@
 package com.azure.resourcemanager.securityinsights.generated;
 
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.securityinsights.models.Constant88;
+import com.azure.resourcemanager.securityinsights.models.Constant90;
 
 /** Samples for EntityQueryTemplates List. */
 public final class EntityQueryTemplatesListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entityQueryTemplates/GetEntityQueryTemplates.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entityQueryTemplates/GetEntityQueryTemplates.json
      */
     /**
      * Sample code: Get all entity query templates.
@@ -19,6 +19,6 @@ public final class EntityQueryTemplatesListSamples {
      */
     public static void getAllEntityQueryTemplates(
         com.azure.resourcemanager.securityinsights.SecurityInsightsManager manager) {
-        manager.entityQueryTemplates().list("myRg", "myWorkspace", Constant88.ACTIVITY, Context.NONE);
+        manager.entityQueryTemplates().list("myRg", "myWorkspace", Constant90.ACTIVITY, Context.NONE);
     }
 }
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityRelationsGetRelationSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityRelationsGetRelationSamples.java
index de44787f195e..632c821343a9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityRelationsGetRelationSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/EntityRelationsGetRelationSamples.java
@@ -9,7 +9,7 @@
 /** Samples for EntityRelations GetRelation. */
 public final class EntityRelationsGetRelationSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/entities/relations/GetEntityRelationByName.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/entities/relations/GetEntityRelationByName.json
      */
     /**
      * Sample code: Get an entity relation.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/FileImportsCreateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/FileImportsCreateSamples.java
index a839ca483bbc..e2570670c8bc 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/FileImportsCreateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/FileImportsCreateSamples.java
@@ -12,7 +12,7 @@
 /** Samples for FileImports Create. */
 public final class FileImportsCreateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/fileImports/CreateFileImport.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/fileImports/CreateFileImport.json
      */
     /**
      * Sample code: Create a file import.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/FileImportsDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/FileImportsDeleteSamples.java
index 6e961ca4a8bd..12b8546546af 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/FileImportsDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/FileImportsDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for FileImports Delete. */
 public final class FileImportsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/fileImports/DeleteFileImport.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/fileImports/DeleteFileImport.json
      */
     /**
      * Sample code: Delete a file import.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/FileImportsGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/FileImportsGetSamples.java
index cf0ff15ffb5b..b0492c129312 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/FileImportsGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/FileImportsGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for FileImports Get. */
 public final class FileImportsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/fileImports/GetFileImportById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/fileImports/GetFileImportById.json
      */
     /**
      * Sample code: Get a file import.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/FileImportsListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/FileImportsListSamples.java
index 4f080eb0b16c..67b807452bfa 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/FileImportsListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/FileImportsListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for FileImports List. */
 public final class FileImportsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/fileImports/GetFileImports.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/fileImports/GetFileImports.json
      */
     /**
      * Sample code: Get all file imports.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentCommentsCreateOrUpdateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentCommentsCreateOrUpdateSamples.java
index 8a16e508a98f..7ac890d5a3cb 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentCommentsCreateOrUpdateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentCommentsCreateOrUpdateSamples.java
@@ -7,7 +7,7 @@
 /** Samples for IncidentComments CreateOrUpdate. */
 public final class IncidentCommentsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/comments/CreateIncidentComment.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/comments/CreateIncidentComment.json
      */
     /**
      * Sample code: Creates or updates an incident comment.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentCommentsDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentCommentsDeleteSamples.java
index ab58f3db35c5..89ccafb0511f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentCommentsDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentCommentsDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for IncidentComments Delete. */
 public final class IncidentCommentsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/comments/DeleteIncidentComment.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/comments/DeleteIncidentComment.json
      */
     /**
      * Sample code: Delete the incident comment.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentCommentsGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentCommentsGetSamples.java
index b0cc0dbe7c41..5d29c075d724 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentCommentsGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentCommentsGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for IncidentComments Get. */
 public final class IncidentCommentsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/comments/GetIncidentCommentById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/comments/GetIncidentCommentById.json
      */
     /**
      * Sample code: Get an incident comment.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentCommentsListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentCommentsListSamples.java
index 3bdb6e55cdb5..5ef9831f0a07 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentCommentsListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentCommentsListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for IncidentComments List. */
 public final class IncidentCommentsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/comments/GetAllIncidentComments.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/comments/GetAllIncidentComments.json
      */
     /**
      * Sample code: Get all incident comments.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentRelationsCreateOrUpdateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentRelationsCreateOrUpdateSamples.java
index 4b99d62695e0..24bdb675e323 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentRelationsCreateOrUpdateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentRelationsCreateOrUpdateSamples.java
@@ -10,7 +10,7 @@
 /** Samples for IncidentRelations CreateOrUpdate. */
 public final class IncidentRelationsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/relations/CreateIncidentRelation.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/relations/CreateIncidentRelation.json
      */
     /**
      * Sample code: Creates or updates an incident relation.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentRelationsDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentRelationsDeleteSamples.java
index e9f0630456b0..005264da9a15 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentRelationsDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentRelationsDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for IncidentRelations Delete. */
 public final class IncidentRelationsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/relations/DeleteIncidentRelation.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/relations/DeleteIncidentRelation.json
      */
     /**
      * Sample code: Delete the incident relation.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentRelationsGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentRelationsGetSamples.java
index 9ca14fce1f49..355c3170c059 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentRelationsGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentRelationsGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for IncidentRelations Get. */
 public final class IncidentRelationsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/relations/GetIncidentRelationByName.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/relations/GetIncidentRelationByName.json
      */
     /**
      * Sample code: Get an incident relation.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentRelationsListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentRelationsListSamples.java
index 223b77dfe78f..04b92b2d137f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentRelationsListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentRelationsListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for IncidentRelations List. */
 public final class IncidentRelationsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/relations/GetAllIncidentRelations.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/relations/GetAllIncidentRelations.json
      */
     /**
      * Sample code: Get all incident relations.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsCreateOrUpdateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsCreateOrUpdateSamples.java
index fac645158493..a5180f2d8797 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsCreateOrUpdateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
 /** Samples for Incidents CreateOrUpdate. */
 public final class IncidentsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/CreateIncident.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/CreateIncident.json
      */
     /**
      * Sample code: Creates or updates an incident.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsCreateTeamSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsCreateTeamSamples.java
index 1d10ad728869..2790a6b24ae8 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsCreateTeamSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsCreateTeamSamples.java
@@ -10,7 +10,7 @@
 /** Samples for Incidents CreateTeam. */
 public final class IncidentsCreateTeamSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/CreateTeam.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/CreateTeam.json
      */
     /**
      * Sample code: Creates incident teams group.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsDeleteSamples.java
index 7213c317f62f..46242aacaa12 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Incidents Delete. */
 public final class IncidentsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/DeleteIncident.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/DeleteIncident.json
      */
     /**
      * Sample code: Delete an incident.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsGetSamples.java
index aaebebca140b..3c976a0624c6 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Incidents Get. */
 public final class IncidentsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/GetIncidentById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/GetIncidentById.json
      */
     /**
      * Sample code: Get an incident.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsListAlertsSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsListAlertsSamples.java
index 521cc7b9a7ea..4c32abc0da5a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsListAlertsSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsListAlertsSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Incidents ListAlerts. */
 public final class IncidentsListAlertsSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/GetAllIncidentAlerts.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/GetAllIncidentAlerts.json
      */
     /**
      * Sample code: Get all incident alerts.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsListBookmarksSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsListBookmarksSamples.java
index 396a34e22e02..47de04f71a4e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsListBookmarksSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsListBookmarksSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Incidents ListBookmarks. */
 public final class IncidentsListBookmarksSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/GetAllIncidentBookmarks.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/GetAllIncidentBookmarks.json
      */
     /**
      * Sample code: Get all incident bookmarks.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsListEntitiesSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsListEntitiesSamples.java
index 05dac3dfd232..1ab2f3e2ba17 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsListEntitiesSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsListEntitiesSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Incidents ListEntities. */
 public final class IncidentsListEntitiesSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/entities/GetAllIncidentEntities.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/entities/GetAllIncidentEntities.json
      */
     /**
      * Sample code: Gets all incident related entities.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsListSamples.java
index 12ee00a614f6..2be5ab5f08a9 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Incidents List. */
 public final class IncidentsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/incidents/GetIncidents.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/incidents/GetIncidents.json
      */
     /**
      * Sample code: Get all incidents.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsRunPlaybookSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsRunPlaybookSamples.java
index 8aff9771734b..a257d7768b55 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsRunPlaybookSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IncidentsRunPlaybookSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Incidents RunPlaybook. */
 public final class IncidentsRunPlaybookSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/manualTrigger/Incidents_RunPlaybook.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/manualTrigger/Incidents_RunPlaybook.json
      */
     /**
      * Sample code: Incidents_RunPlaybook.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IpGeodataGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IpGeodataGetSamples.java
index 4c5af0fbd9f2..288ed3bab23c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IpGeodataGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/IpGeodataGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for IpGeodata Get. */
 public final class IpGeodataGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/enrichment/GetGeodataByIp.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/enrichment/GetGeodataByIp.json
      */
     /**
      * Sample code: Get geodata for a single IP address.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataCreateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataCreateSamples.java
index 2e1c2cff2c93..1f9d44efac1f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataCreateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataCreateSamples.java
@@ -19,7 +19,7 @@
 /** Samples for Metadata Create. */
 public final class MetadataCreateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/metadata/PutMetadata.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/metadata/PutMetadata.json
      */
     /**
      * Sample code: Create/update full metadata.
@@ -95,7 +95,7 @@ public static void createUpdateFullMetadata(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/metadata/PutMetadataMinimal.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/metadata/PutMetadataMinimal.json
      */
     /**
      * Sample code: Create/update minimal metadata.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataDeleteSamples.java
index 83b191e5ca95..f755c90268e7 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Metadata Delete. */
 public final class MetadataDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/metadata/DeleteMetadata.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/metadata/DeleteMetadata.json
      */
     /**
      * Sample code: Delete metadata.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataGetSamples.java
index 9d738dafd085..93599f1b371b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Metadata Get. */
 public final class MetadataGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/metadata/GetMetadata.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/metadata/GetMetadata.json
      */
     /**
      * Sample code: Get single metadata by name.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataListSamples.java
index 05d6eb76725f..487da9dfa1b0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Metadata List. */
 public final class MetadataListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/metadata/GetAllMetadata.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/metadata/GetAllMetadata.json
      */
     /**
      * Sample code: Get all metadata.
@@ -21,7 +21,7 @@ public static void getAllMetadata(com.azure.resourcemanager.securityinsights.Sec
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/metadata/GetAllMetadataOData.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/metadata/GetAllMetadataOData.json
      */
     /**
      * Sample code: Get all metadata with OData filter/orderby/skip/top.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataUpdateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataUpdateSamples.java
index 91f5be55253b..a5c3564e4108 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataUpdateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/MetadataUpdateSamples.java
@@ -11,7 +11,7 @@
 /** Samples for Metadata Update. */
 public final class MetadataUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/metadata/PatchMetadata.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/metadata/PatchMetadata.json
      */
     /**
      * Sample code: Update metadata.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/OfficeConsentsDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/OfficeConsentsDeleteSamples.java
index 83381c6ff091..a688b8704b43 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/OfficeConsentsDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/OfficeConsentsDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for OfficeConsents Delete. */
 public final class OfficeConsentsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/officeConsents/DeleteOfficeConsents.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/officeConsents/DeleteOfficeConsents.json
      */
     /**
      * Sample code: Delete an office consent.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/OfficeConsentsGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/OfficeConsentsGetSamples.java
index 82ebecfad742..7ff466c0a7ae 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/OfficeConsentsGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/OfficeConsentsGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for OfficeConsents Get. */
 public final class OfficeConsentsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/officeConsents/GetOfficeConsentsById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/officeConsents/GetOfficeConsentsById.json
      */
     /**
      * Sample code: Get an office consent.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/OfficeConsentsListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/OfficeConsentsListSamples.java
index bff20163b14d..7cb9fd04db50 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/OfficeConsentsListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/OfficeConsentsListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for OfficeConsents List. */
 public final class OfficeConsentsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/officeConsents/GetOfficeConsents.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/officeConsents/GetOfficeConsents.json
      */
     /**
      * Sample code: Get all office consents.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/OperationsListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/OperationsListSamples.java
index bd9e0689a55d..9bbfda5b39cd 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/OperationsListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/OperationsListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Operations List. */
 public final class OperationsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/operations/ListOperations.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/operations/ListOperations.json
      */
     /**
      * Sample code: Get all operations.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ProductSettingsDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ProductSettingsDeleteSamples.java
index 9b87891b4ad7..cfdea2d5d013 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ProductSettingsDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ProductSettingsDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for ProductSettings Delete. */
 public final class ProductSettingsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/settings/DeleteEyesOnSetting.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/settings/DeleteEyesOnSetting.json
      */
     /**
      * Sample code: Delete EyesOn settings.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ProductSettingsGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ProductSettingsGetSamples.java
index c48e37a90773..803e36291338 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ProductSettingsGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ProductSettingsGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for ProductSettings Get. */
 public final class ProductSettingsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/settings/GetEyesOnSetting.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/settings/GetEyesOnSetting.json
      */
     /**
      * Sample code: Get EyesOn settings.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ProductSettingsListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ProductSettingsListSamples.java
index e54fd9e369a6..de8f4d088433 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ProductSettingsListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ProductSettingsListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for ProductSettings List. */
 public final class ProductSettingsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/settings/GetAllSettings.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/settings/GetAllSettings.json
      */
     /**
      * Sample code: Get all settings.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ProductSettingsUpdateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ProductSettingsUpdateSamples.java
index d84adcba1067..35eeb66b101f 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ProductSettingsUpdateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ProductSettingsUpdateSamples.java
@@ -10,7 +10,7 @@
 /** Samples for ProductSettings Update. */
 public final class ProductSettingsUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/settings/UpdateEyesOnSetting.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/settings/UpdateEyesOnSetting.json
      */
     /**
      * Sample code: Update EyesOn settings.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SecurityMLAnalyticsSettingsCreateOrUpdateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SecurityMLAnalyticsSettingsCreateOrUpdateSamples.java
index 4f4f433d1c48..69bc6b2986fd 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SecurityMLAnalyticsSettingsCreateOrUpdateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SecurityMLAnalyticsSettingsCreateOrUpdateSamples.java
@@ -19,7 +19,7 @@
 /** Samples for SecurityMLAnalyticsSettings CreateOrUpdate. */
 public final class SecurityMLAnalyticsSettingsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/securityMLAnalyticsSettings/CreateAnomalySecurityMLAnalyticsSetting.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/securityMLAnalyticsSettings/CreateAnomalySecurityMLAnalyticsSetting.json
      */
     /**
      * Sample code: Creates or updates a Anomaly Security ML Analytics Settings.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SecurityMLAnalyticsSettingsDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SecurityMLAnalyticsSettingsDeleteSamples.java
index 5a7fbfb4f91a..c09c8489a579 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SecurityMLAnalyticsSettingsDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SecurityMLAnalyticsSettingsDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for SecurityMLAnalyticsSettings Delete. */
 public final class SecurityMLAnalyticsSettingsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/securityMLAnalyticsSettings/DeleteSecurityMLAnalyticsSetting.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/securityMLAnalyticsSettings/DeleteSecurityMLAnalyticsSetting.json
      */
     /**
      * Sample code: Delete a Security ML Analytics Settings.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SecurityMLAnalyticsSettingsGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SecurityMLAnalyticsSettingsGetSamples.java
index fa8f8cd73f74..a82e9b3282ad 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SecurityMLAnalyticsSettingsGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SecurityMLAnalyticsSettingsGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for SecurityMLAnalyticsSettings Get. */
 public final class SecurityMLAnalyticsSettingsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/securityMLAnalyticsSettings/GetAnomalySecurityMLAnalyticsSetting.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/securityMLAnalyticsSettings/GetAnomalySecurityMLAnalyticsSetting.json
      */
     /**
      * Sample code: Get a Anomaly Security ML Analytics Settings.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SecurityMLAnalyticsSettingsListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SecurityMLAnalyticsSettingsListSamples.java
index a8eb1f6d6008..55f21b94391e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SecurityMLAnalyticsSettingsListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SecurityMLAnalyticsSettingsListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for SecurityMLAnalyticsSettings List. */
 public final class SecurityMLAnalyticsSettingsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/securityMLAnalyticsSettings/GetAllSecurityMLAnalyticsSettings.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/securityMLAnalyticsSettings/GetAllSecurityMLAnalyticsSettings.json
      */
     /**
      * Sample code: Get all Security ML Analytics Settings.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SentinelOnboardingStatesCreateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SentinelOnboardingStatesCreateSamples.java
index 177a2c21f7ab..f1f0150f4df5 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SentinelOnboardingStatesCreateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SentinelOnboardingStatesCreateSamples.java
@@ -7,7 +7,7 @@
 /** Samples for SentinelOnboardingStates Create. */
 public final class SentinelOnboardingStatesCreateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/onboardingStates/CreateSentinelOnboardingState.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/onboardingStates/CreateSentinelOnboardingState.json
      */
     /**
      * Sample code: Create Sentinel onboarding state.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SentinelOnboardingStatesDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SentinelOnboardingStatesDeleteSamples.java
index 73d131daaf98..e491b49550f1 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SentinelOnboardingStatesDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SentinelOnboardingStatesDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for SentinelOnboardingStates Delete. */
 public final class SentinelOnboardingStatesDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/onboardingStates/DeleteSentinelOnboardingState.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/onboardingStates/DeleteSentinelOnboardingState.json
      */
     /**
      * Sample code: Delete Sentinel onboarding state.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SentinelOnboardingStatesGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SentinelOnboardingStatesGetSamples.java
index 1e61ad09b71b..06caaa885ea8 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SentinelOnboardingStatesGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SentinelOnboardingStatesGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for SentinelOnboardingStates Get. */
 public final class SentinelOnboardingStatesGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/onboardingStates/GetSentinelOnboardingState.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/onboardingStates/GetSentinelOnboardingState.json
      */
     /**
      * Sample code: Get Sentinel onboarding state.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SentinelOnboardingStatesListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SentinelOnboardingStatesListSamples.java
index 089fa7920c92..fb4988950717 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SentinelOnboardingStatesListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SentinelOnboardingStatesListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for SentinelOnboardingStates List. */
 public final class SentinelOnboardingStatesListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/onboardingStates/GetAllSentinelOnboardingStates.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/onboardingStates/GetAllSentinelOnboardingStates.json
      */
     /**
      * Sample code: Get all Sentinel onboarding states.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlListRepositoriesSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlListRepositoriesSamples.java
index eedc402653a9..73ee52cc286d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlListRepositoriesSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlListRepositoriesSamples.java
@@ -10,7 +10,7 @@
 /** Samples for SourceControl ListRepositories. */
 public final class SourceControlListRepositoriesSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/repositories/GetRepositories.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/repositories/GetRepositories.json
      */
     /**
      * Sample code: Get repository list.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlsOperationCreateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlsOperationCreateSamples.java
index 3981370a4a6f..03f08210329b 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlsOperationCreateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlsOperationCreateSamples.java
@@ -13,7 +13,7 @@
 /** Samples for SourceControlsOperation Create. */
 public final class SourceControlsOperationCreateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/sourcecontrols/CreateSourceControl.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/sourcecontrols/CreateSourceControl.json
      */
     /**
      * Sample code: Creates a source control.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlsOperationDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlsOperationDeleteSamples.java
index 3479bbc73c0d..43695da415b8 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlsOperationDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlsOperationDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for SourceControlsOperation Delete. */
 public final class SourceControlsOperationDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/sourcecontrols/DeleteSourceControl.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/sourcecontrols/DeleteSourceControl.json
      */
     /**
      * Sample code: Delete a source control.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlsOperationGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlsOperationGetSamples.java
index e311a8036dba..86637ada9757 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlsOperationGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlsOperationGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for SourceControlsOperation Get. */
 public final class SourceControlsOperationGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/sourcecontrols/GetSourceControlById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/sourcecontrols/GetSourceControlById.json
      */
     /**
      * Sample code: Get a source control.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlsOperationListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlsOperationListSamples.java
index 348b8fabfa69..c35403cf24b4 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlsOperationListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/SourceControlsOperationListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for SourceControlsOperation List. */
 public final class SourceControlsOperationListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/sourcecontrols/GetSourceControls.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/sourcecontrols/GetSourceControls.json
      */
     /**
      * Sample code: Get all source controls.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorAppendTagsSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorAppendTagsSamples.java
index 19453e0a796a..f795fe214bc6 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorAppendTagsSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorAppendTagsSamples.java
@@ -11,7 +11,7 @@
 /** Samples for ThreatIntelligenceIndicator AppendTags. */
 public final class ThreatIntelligenceIndicatorAppendTagsSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/AppendTagsThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/AppendTagsThreatIntelligence.json
      */
     /**
      * Sample code: Append tags to a threat intelligence indicator.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorCreateIndicatorSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorCreateIndicatorSamples.java
index 1934f75a9e79..9b0af79a11b0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorCreateIndicatorSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorCreateIndicatorSamples.java
@@ -11,7 +11,7 @@
 /** Samples for ThreatIntelligenceIndicator CreateIndicator. */
 public final class ThreatIntelligenceIndicatorCreateIndicatorSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/CreateThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/CreateThreatIntelligence.json
      */
     /**
      * Sample code: Create a new Threat Intelligence.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorCreateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorCreateSamples.java
index 6185703dc8aa..28d934cf21bb 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorCreateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorCreateSamples.java
@@ -11,7 +11,7 @@
 /** Samples for ThreatIntelligenceIndicator Create. */
 public final class ThreatIntelligenceIndicatorCreateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/UpdateThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/UpdateThreatIntelligence.json
      */
     /**
      * Sample code: Update a threat Intelligence indicator.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorDeleteSamples.java
index fe4c1fb359c4..8e55af28160d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for ThreatIntelligenceIndicator Delete. */
 public final class ThreatIntelligenceIndicatorDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/DeleteThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/DeleteThreatIntelligence.json
      */
     /**
      * Sample code: Delete a threat intelligence indicator.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorGetSamples.java
index 73c9f32e2419..34c2545b213e 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for ThreatIntelligenceIndicator Get. */
 public final class ThreatIntelligenceIndicatorGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/GetThreatIntelligenceById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/GetThreatIntelligenceById.json
      */
     /**
      * Sample code: View a threat intelligence indicator by name.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorMetricsListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorMetricsListSamples.java
index d04ce8551107..282191f9eeb6 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorMetricsListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorMetricsListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for ThreatIntelligenceIndicatorMetrics List. */
 public final class ThreatIntelligenceIndicatorMetricsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/CollectThreatIntelligenceMetrics.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/CollectThreatIntelligenceMetrics.json
      */
     /**
      * Sample code: Get threat intelligence indicators metrics.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorQueryIndicatorsSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorQueryIndicatorsSamples.java
index 487339a28251..dc38943fec6a 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorQueryIndicatorsSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorQueryIndicatorsSamples.java
@@ -13,7 +13,7 @@
 /** Samples for ThreatIntelligenceIndicator QueryIndicators. */
 public final class ThreatIntelligenceIndicatorQueryIndicatorsSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/QueryThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/QueryThreatIntelligence.json
      */
     /**
      * Sample code: Query threat intelligence indicators as per filtering criteria.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorReplaceTagsSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorReplaceTagsSamples.java
index 96e9c364d8e4..f67c6fc983c3 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorReplaceTagsSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorReplaceTagsSamples.java
@@ -11,7 +11,7 @@
 /** Samples for ThreatIntelligenceIndicator ReplaceTags. */
 public final class ThreatIntelligenceIndicatorReplaceTagsSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/ReplaceTagsThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/ReplaceTagsThreatIntelligence.json
      */
     /**
      * Sample code: Replace tags to a Threat Intelligence.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorsOperationListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorsOperationListSamples.java
index 3ab41f9ce6d6..92cf14226e47 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorsOperationListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/ThreatIntelligenceIndicatorsOperationListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for ThreatIntelligenceIndicatorsOperation List. */
 public final class ThreatIntelligenceIndicatorsOperationListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/threatintelligence/GetThreatIntelligence.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/threatintelligence/GetThreatIntelligence.json
      */
     /**
      * Sample code: Get all threat intelligence indicators.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistItemsCreateOrUpdateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistItemsCreateOrUpdateSamples.java
index f6508ac2af4a..33bc806e11dd 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistItemsCreateOrUpdateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistItemsCreateOrUpdateSamples.java
@@ -10,7 +10,7 @@
 /** Samples for WatchlistItems CreateOrUpdate. */
 public final class WatchlistItemsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/CreateWatchlistItem.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/CreateWatchlistItem.json
      */
     /**
      * Sample code: Creates or updates a watchlist item.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistItemsDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistItemsDeleteSamples.java
index 95b63e3a64e9..6fcbf5e3475d 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistItemsDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistItemsDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for WatchlistItems Delete. */
 public final class WatchlistItemsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/DeleteWatchlistItem.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/DeleteWatchlistItem.json
      */
     /**
      * Sample code: Delete a watchlist Item.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistItemsGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistItemsGetSamples.java
index e86b44a1108a..7ed22f52b9c8 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistItemsGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistItemsGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for WatchlistItems Get. */
 public final class WatchlistItemsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/GetWatchlistItemById.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/GetWatchlistItemById.json
      */
     /**
      * Sample code: Get a watchlist item.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistItemsListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistItemsListSamples.java
index 7fe192510721..44bf6d579f33 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistItemsListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistItemsListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for WatchlistItems List. */
 public final class WatchlistItemsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/GetWatchlistItems.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/GetWatchlistItems.json
      */
     /**
      * Sample code: Get all watchlist Items.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistsCreateOrUpdateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistsCreateOrUpdateSamples.java
index d668e090cc94..3e6794e3ce2c 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistsCreateOrUpdateSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistsCreateOrUpdateSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Watchlists CreateOrUpdate. */
 public final class WatchlistsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/CreateWatchlistAndWatchlistItems.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/CreateWatchlistAndWatchlistItems.json
      */
     /**
      * Sample code: Creates or updates a watchlist and bulk creates watchlist items.
@@ -36,7 +36,7 @@ public static void createsOrUpdatesAWatchlistAndBulkCreatesWatchlistItems(
     }
 
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/CreateWatchlist.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/CreateWatchlist.json
      */
     /**
      * Sample code: Creates or updates a watchlist.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistsDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistsDeleteSamples.java
index 173a9fdce43f..b26334c18b08 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistsDeleteSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistsDeleteSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Watchlists Delete. */
 public final class WatchlistsDeleteSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/DeleteWatchlist.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/DeleteWatchlist.json
      */
     /**
      * Sample code: Delete a watchlist.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistsGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistsGetSamples.java
index 5de292dd4f01..8bae5e38eace 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistsGetSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistsGetSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Watchlists Get. */
 public final class WatchlistsGetSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/GetWatchlistByAlias.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/GetWatchlistByAlias.json
      */
     /**
      * Sample code: Get a watchlist.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistsListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistsListSamples.java
index 1ff890f70c81..f69740e15065 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistsListSamples.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WatchlistsListSamples.java
@@ -9,7 +9,7 @@
 /** Samples for Watchlists List. */
 public final class WatchlistsListSamples {
     /*
-     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-09-01-preview/examples/watchlists/GetWatchlists.json
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/watchlists/GetWatchlists.json
      */
     /**
      * Sample code: Get all watchlists.
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WorkspaceManagerConfigurationsCreateOrUpdateSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WorkspaceManagerConfigurationsCreateOrUpdateSamples.java
new file mode 100644
index 000000000000..53b9681220ed
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WorkspaceManagerConfigurationsCreateOrUpdateSamples.java
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.generated;
+
+import com.azure.resourcemanager.securityinsights.models.Mode;
+
+/** Samples for WorkspaceManagerConfigurations CreateOrUpdate. */
+public final class WorkspaceManagerConfigurationsCreateOrUpdateSamples {
+    /*
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/workspaceManagerConfigurations/CreateOrUpdateWorkspaceManagerConfiguration.json
+     */
+    /**
+     * Sample code: Create or Update a workspace manager Configuration.
+     *
+     * @param manager Entry point to SecurityInsightsManager.
+     */
+    public static void createOrUpdateAWorkspaceManagerConfiguration(
+        com.azure.resourcemanager.securityinsights.SecurityInsightsManager manager) {
+        manager
+            .workspaceManagerConfigurations()
+            .define("default")
+            .withExistingWorkspace("myRg", "myWorkspace")
+            .withMode(Mode.ENABLED)
+            .create();
+    }
+}
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WorkspaceManagerConfigurationsDeleteSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WorkspaceManagerConfigurationsDeleteSamples.java
new file mode 100644
index 000000000000..7d6d9c181d9a
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WorkspaceManagerConfigurationsDeleteSamples.java
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.generated;
+
+import com.azure.core.util.Context;
+
+/** Samples for WorkspaceManagerConfigurations Delete. */
+public final class WorkspaceManagerConfigurationsDeleteSamples {
+    /*
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/workspaceManagerConfigurations/DeleteWorkspaceManagerConfiguration.json
+     */
+    /**
+     * Sample code: Delete a workspace manager configuration.
+     *
+     * @param manager Entry point to SecurityInsightsManager.
+     */
+    public static void deleteAWorkspaceManagerConfiguration(
+        com.azure.resourcemanager.securityinsights.SecurityInsightsManager manager) {
+        manager.workspaceManagerConfigurations().deleteWithResponse("myRg", "myWorkspace", "default", Context.NONE);
+    }
+}
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WorkspaceManagerConfigurationsGetSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WorkspaceManagerConfigurationsGetSamples.java
new file mode 100644
index 000000000000..6f455c39c160
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WorkspaceManagerConfigurationsGetSamples.java
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.generated;
+
+import com.azure.core.util.Context;
+
+/** Samples for WorkspaceManagerConfigurations Get. */
+public final class WorkspaceManagerConfigurationsGetSamples {
+    /*
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/workspaceManagerConfigurations/GetWorkspaceManagerConfiguration.json
+     */
+    /**
+     * Sample code: Get a workspace manager configuration.
+     *
+     * @param manager Entry point to SecurityInsightsManager.
+     */
+    public static void getAWorkspaceManagerConfiguration(
+        com.azure.resourcemanager.securityinsights.SecurityInsightsManager manager) {
+        manager.workspaceManagerConfigurations().getWithResponse("myRg", "myWorkspace", "default", Context.NONE);
+    }
+}
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WorkspaceManagerConfigurationsListSamples.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WorkspaceManagerConfigurationsListSamples.java
new file mode 100644
index 000000000000..9a75b2c8706a
--- /dev/null
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/samples/java/com/azure/resourcemanager/securityinsights/generated/WorkspaceManagerConfigurationsListSamples.java
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.securityinsights.generated;
+
+import com.azure.core.util.Context;
+
+/** Samples for WorkspaceManagerConfigurations List. */
+public final class WorkspaceManagerConfigurationsListSamples {
+    /*
+     * x-ms-original-file: specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2023-03-01-preview/examples/workspaceManagerConfigurations/GetAllWorkspaceManagerConfigurations.json
+     */
+    /**
+     * Sample code: Get all workspace manager configurations for a Sentinel workspace.
+     *
+     * @param manager Entry point to SecurityInsightsManager.
+     */
+    public static void getAllWorkspaceManagerConfigurationsForASentinelWorkspace(
+        com.azure.resourcemanager.securityinsights.SecurityInsightsManager manager) {
+        manager.workspaceManagerConfigurations().list("myRg", "myWorkspace", null, null, null, Context.NONE);
+    }
+}