diff --git a/sdk/resourcemanager/azure-resourcemanager/pom.xml b/sdk/resourcemanager/azure-resourcemanager/pom.xml
index e0cf89f3628c4..2fe016f8f2617 100644
--- a/sdk/resourcemanager/azure-resourcemanager/pom.xml
+++ b/sdk/resourcemanager/azure-resourcemanager/pom.xml
@@ -58,7 +58,6 @@
 
       --add-opens com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED
     </javaModulesSurefireArgLine>
-    <doclintMissingInclusion>-</doclintMissingInclusion>
   </properties>
 
   <developers>
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/AzureResourceManager.java b/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/AzureResourceManager.java
index 89ccf6eb7a139..b6a86eac41fe9 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/AzureResourceManager.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/AzureResourceManager.java
@@ -261,7 +261,11 @@ public Authenticated authenticate(TokenCredential credential, AzureProfile profi
      * previously specified authentication file).
      */
     public interface Authenticated extends AccessManagement {
-        /** @return the currently selected tenant ID this client is authenticated to work with */
+        /**
+         * Gets the currently selected tenant ID this client is authenticated to work with.
+         *
+         * @return the currently selected tenant ID this client is authenticated to work with
+         */
         String tenantId();
 
         /**
@@ -431,67 +435,119 @@ private AzureResourceManager(HttpPipeline httpPipeline, AzureProfile profile, Au
         this.tenantId = profile.getTenantId();
     }
 
-    /** @return the currently selected subscription ID this client is authenticated to work with */
+    /**
+     * Gets the currently selected subscription ID this client is authenticated to work with.
+     *
+     * @return the currently selected subscription ID this client is authenticated to work with
+     */
     public String subscriptionId() {
         return this.subscriptionId;
     }
 
-    /** @return the currently selected tenant ID this client is authenticated to work with */
+    /**
+     * Gets the currently selected tenant ID this client is authenticated to work with.
+     *
+     * @return the currently selected tenant ID this client is authenticated to work with
+     */
     public String tenantId() {
         return this.tenantId;
     }
 
-    /** @return the currently selected subscription this client is authenticated to work with */
+    /**
+     * Gets the currently selected subscription this client is authenticated to work with.
+     *
+     * @return the currently selected subscription this client is authenticated to work with
+     */
     public Subscription getCurrentSubscription() {
         return this.subscriptions().getById(this.subscriptionId());
     }
 
-    /** @return entry point to managing subscriptions */
+    /**
+     * Gets entry point to managing subscriptions.
+     *
+     * @return entry point to managing subscriptions
+     */
     public Subscriptions subscriptions() {
         return this.resourceManager.subscriptions();
     }
 
-    /** @return entry point to managing tenants */
+    /**
+     * Gets entry point to managing tenants.
+     *
+     * @return entry point to managing tenants
+     */
     public Tenants tenants() {
         return this.resourceManager.tenants();
     }
 
-    /** @return entry point to managing resource groups */
+    /**
+     * Gets entry point to managing resource groups.
+     *
+     * @return entry point to managing resource groups
+     */
     public ResourceGroups resourceGroups() {
         return this.resourceManager.resourceGroups();
     }
 
-    /** @return entry point to managing deployments */
+    /**
+     * Gets entry point to managing deployments.
+     *
+     * @return entry point to managing deployments
+     */
     public Deployments deployments() {
         return this.resourceManager.deployments();
     }
 
-    /** @return entry point to managing generic resources */
+    /**
+     * Gets entry point to managing generic resources.
+     *
+     * @return entry point to managing generic resources
+     */
     public GenericResources genericResources() {
         return resourceManager.genericResources();
     }
 
-    /** @return entry point to managing features */
+    /**
+     * Gets entry point to managing features.
+     *
+     * @return entry point to managing features
+     */
     public Features features() {
         return resourceManager.features();
     }
 
-    /** @return entry point to managing resource providers */
+    /**
+     * Gets entry point to managing resource providers.
+     *
+     * @return entry point to managing resource providers
+     */
     public Providers providers() {
         return resourceManager.providers();
     }
 
-    /** @return entry point to managing policy definitions. */
+    /**
+     * Gets entry point to managing policy definitions.
+     *
+     * @return entry point to managing policy definitions.
+     */
     public PolicyDefinitions policyDefinitions() {
         return resourceManager.policyDefinitions();
     }
 
-    /** @return entry point to managing policy assignments. */
+    /**
+     * Gets entry point to managing policy assignments.
+     *
+     * @return entry point to managing policy assignments.
+     */
     public PolicyAssignments policyAssignments() {
         return resourceManager.policyAssignments();
     }
 
-    /** @return entry point to managing locks. */
+    /**
+     * Gets entry point to managing locks.
+     *
+     * @return entry point to managing locks.
+     */
     public ManagementLocks managementLocks() {
         return resourceManager.managementLocks();
     }
@@ -521,87 +577,155 @@ public StorageAccounts storageAccounts() {
         return storageManager.storageAccounts();
     }
 
-    /** @return entry point to managing storage account usages */
+    /**
+     * Gets entry point to managing storage account usages.
+     *
+     * @return entry point to managing storage account usages
+     */
     public Usages storageUsages() {
         return storageManager.usages();
     }
 
-    /** @return entry point to managing storage service SKUs */
+    /**
+     * Gets entry point to managing storage service SKUs.
+     *
+     * @return entry point to managing storage service SKUs
+     */
     public StorageSkus storageSkus() {
         return storageManager.storageSkus();
     }
 
-    /** @return entry point to managing availability sets */
+    /**
+     * Gets entry point to managing availability sets.
+     *
+     * @return entry point to managing availability sets
+     */
     public AvailabilitySets availabilitySets() {
         return computeManager.availabilitySets();
     }
 
-    /** @return entry point to managing virtual networks */
+    /**
+     * Gets entry point to managing virtual networks.
+     *
+     * @return entry point to managing virtual networks
+     */
     public Networks networks() {
         return networkManager.networks();
     }
 
-    /** @return entry point to managing route tables */
+    /**
+     * Gets entry point to managing route tables.
+     *
+     * @return entry point to managing route tables
+     */
     public RouteTables routeTables() {
         return networkManager.routeTables();
     }
 
-    /** @return entry point to managing load balancers */
+    /**
+     * Gets entry point to managing load balancers.
+     *
+     * @return entry point to managing load balancers
+     */
     public LoadBalancers loadBalancers() {
         return networkManager.loadBalancers();
     }
 
-    /** @return entry point to managing application gateways */
+    /**
+     * Gets entry point to managing application gateways.
+     *
+     * @return entry point to managing application gateways
+     */
     public ApplicationGateways applicationGateways() {
         return networkManager.applicationGateways();
     }
 
-    /** @return entry point to managing network security groups */
+    /**
+     * Gets entry point to managing network security groups.
+     *
+     * @return entry point to managing network security groups
+     */
     public NetworkSecurityGroups networkSecurityGroups() {
         return networkManager.networkSecurityGroups();
     }
 
-    /** @return entry point to managing network resource usages */
+    /**
+     * Gets entry point to managing network resource usages.
+     *
+     * @return entry point to managing network resource usages
+     */
     public NetworkUsages networkUsages() {
         return networkManager.usages();
     }
 
-    /** @return entry point to managing network watchers */
+    /**
+     * Gets entry point to managing network watchers.
+     *
+     * @return entry point to managing network watchers
+     */
     public NetworkWatchers networkWatchers() {
         return networkManager.networkWatchers();
     }
 
-    /** @return entry point to managing virtual network gateways */
+    /**
+     * Gets entry point to managing virtual network gateways.
+     *
+     * @return entry point to managing virtual network gateways
+     */
     public VirtualNetworkGateways virtualNetworkGateways() {
         return networkManager.virtualNetworkGateways();
     }
 
-    /** @return entry point to managing local network gateways */
+    /**
+     * Gets entry point to managing local network gateways.
+     *
+     * @return entry point to managing local network gateways
+     */
     public LocalNetworkGateways localNetworkGateways() {
         return networkManager.localNetworkGateways();
     }
 
-    /** @return entry point to managing express route circuits */
+    /**
+     * Gets entry point to managing express route circuits.
+     *
+     * @return entry point to managing express route circuits
+     */
     public ExpressRouteCircuits expressRouteCircuits() {
         return networkManager.expressRouteCircuits();
     }
 
-    /** @return entry point to managing express route cross connections */
+    /**
+     * Gets entry point to managing express route cross connections.
+     *
+     * @return entry point to managing express route cross connections
+     */
     public ExpressRouteCrossConnections expressRouteCrossConnections() {
         return networkManager.expressRouteCrossConnections();
     }
 
-    /** @return entry point to managing express route circuits */
+    /**
+     * Gets entry point to managing express route circuits.
+     *
+     * @return entry point to managing express route circuits
+     */
     public ApplicationSecurityGroups applicationSecurityGroups() {
         return networkManager.applicationSecurityGroups();
     }
 
-    /** @return entry point to managing route filters */
+    /**
+     * Gets entry point to managing route filters.
+     *
+     * @return entry point to managing route filters
+     */
     public RouteFilters routeFilters() {
         return networkManager.routeFilters();
     }
 
-    /** @return entry point to managing DDoS protection plans */
+    /**
+     * Gets entry point to managing DDoS protection plans.
+     *
+     * @return entry point to managing DDoS protection plans
+     */
     public DdosProtectionPlans ddosProtectionPlans() {
         return networkManager.ddosProtectionPlans();
     }
@@ -646,57 +770,101 @@ public VirtualMachines virtualMachines() {
         return computeManager.virtualMachines();
     }
 
-    /** @return entry point to managing virtual machine scale sets. */
+    /**
+     * Gets entry point to managing virtual machine scale sets.
+     *
+     * @return entry point to managing virtual machine scale sets.
+     */
     public VirtualMachineScaleSets virtualMachineScaleSets() {
         return computeManager.virtualMachineScaleSets();
     }
 
-    /** @return entry point to managing virtual machine images */
+    /**
+     * Gets entry point to managing virtual machine images.
+     *
+     * @return entry point to managing virtual machine images
+     */
     public VirtualMachineImages virtualMachineImages() {
         return computeManager.virtualMachineImages();
     }
 
-    /** @return entry point to managing virtual machine custom images */
+    /**
+     * Gets entry point to managing virtual machine custom images.
+     *
+     * @return entry point to managing virtual machine custom images
+     */
     public VirtualMachineCustomImages virtualMachineCustomImages() {
         return computeManager.virtualMachineCustomImages();
     }
 
-    /** @return entry point to managing managed disks */
+    /**
+     * Gets entry point to managing managed disks.
+     *
+     * @return entry point to managing managed disks
+     */
     public Disks disks() {
         return computeManager.disks();
     }
 
-    /** @return entry point to managing managed snapshots */
+    /**
+     * Gets entry point to managing managed snapshots.
+     *
+     * @return entry point to managing managed snapshots
+     */
     public Snapshots snapshots() {
         return computeManager.snapshots();
     }
 
-    /** @return the compute service SKU management API entry point */
+    /**
+     * Gets the compute service SKU management API entry point.
+     *
+     * @return the compute service SKU management API entry point
+     */
     public ComputeSkus computeSkus() {
         return computeManager.computeSkus();
     }
 
-    /** @return entry point to managing public IP addresses */
+    /**
+     * Gets entry point to managing public IP addresses.
+     *
+     * @return entry point to managing public IP addresses
+     */
     public PublicIpAddresses publicIpAddresses() {
         return this.networkManager.publicIpAddresses();
     }
 
-    /** @return entry point to managing public IP prefixes */
+    /**
+     * Gets entry point to managing public IP prefixes.
+     *
+     * @return entry point to managing public IP prefixes
+     */
     public PublicIpPrefixes publicIpPrefixes() {
         return this.networkManager.publicIpPrefixes();
     }
 
-    /** @return entry point to managing network interfaces */
+    /**
+     * Gets entry point to managing network interfaces.
+     *
+     * @return entry point to managing network interfaces
+     */
     public NetworkInterfaces networkInterfaces() {
         return this.networkManager.networkInterfaces();
     }
 
-    /** @return entry point to managing compute resource usages */
+    /**
+     * Gets entry point to managing compute resource usages.
+     *
+     * @return entry point to managing compute resource usages
+     */
     public ComputeUsages computeUsages() {
         return computeManager.usages();
     }
 
-    /** @return entry point to managing key vaults */
+    /**
+     * Gets entry point to managing key vaults.
+     *
+     * @return entry point to managing key vaults
+     */
     public Vaults vaults() {
         return this.keyVaultManager.vaults();
     }
@@ -709,30 +877,46 @@ public Vaults vaults() {
     //    }
 
     /**
+     * Gets entry point to managing traffic manager profiles.
+     *
      * @return entry point to managing traffic manager profiles.
      */
     public TrafficManagerProfiles trafficManagerProfiles() {
         return trafficManager.profiles();
     }
 
-    /** @return entry point to managing Redis Caches. */
+    /**
+     * Gets entry point to managing Redis Caches.
+     *
+     * @return entry point to managing Redis Caches.
+     */
     public RedisCaches redisCaches() {
         return redisManager.redisCaches();
     }
 
     /**
+     * Gets entry point to managing cdn manager profiles.
+     *
      * @return entry point to managing cdn manager profiles.
      */
     public CdnProfiles cdnProfiles() {
         return cdnManager.profiles();
     }
 
-    /** @return entry point to managing DNS zones. */
+    /**
+     * Gets entry point to managing DNS zones.
+     *
+     * @return entry point to managing DNS zones.
+     */
     public DnsZones dnsZones() {
         return dnsZoneManager.zones();
     }
 
-    /** @return entry point to managing web apps. */
+    /**
+     * Gets entry point to managing web apps.
+     *
+     * @return entry point to managing web apps.
+     */
     public WebApps webApps() {
         return appServiceManager.webApps();
     }
@@ -776,32 +960,54 @@ public FunctionApps functionApps() {
         return appServiceManager.functionApps();
     }
 
-    /** @return entry point to managing app service plans. */
+    /**
+     * Gets entry point to managing app service plans.
+     *
+     * @return entry point to managing app service plans.
+     */
     public AppServicePlans appServicePlans() {
         return appServiceManager.appServicePlans();
     }
 
-    /** @return entry point to managing domains. */
+    /**
+     * Gets entry point to managing domains.
+     *
+     * @return entry point to managing domains.
+     */
     public AppServiceDomains appServiceDomains() {
         return appServiceManager.domains();
     }
 
-    /** @return entry point to managing certificates. */
+    /**
+     * Gets entry point to managing certificates.
+     *
+     * @return entry point to managing certificates.
+     */
     public AppServiceCertificates appServiceCertificates() {
         return appServiceManager.certificates();
     }
 
-    /** @return entry point to managing certificates orders. */
+    /**
+     * Gets entry point to managing certificates orders.
+     *
+     * @return entry point to managing certificates orders.
+     */
     public AppServiceCertificateOrders appServiceCertificateOrders() {
         return appServiceManager.certificateOrders();
     }
 
-    /** @return entry point to managing Sql server. */
+    /**
+     * Gets entry point to managing Sql server.
+     *
+     * @return entry point to managing Sql server.
+     */
     public SqlServers sqlServers() {
         return sqlServerManager.sqlServers();
     }
 
     /**
+     * Gets entry point to managing Service Bus.
+     *
      * @return entry point to managing Service Bus.
      */
     public ServiceBusNamespaces serviceBusNamespaces() {
@@ -815,84 +1021,144 @@ public ServiceBusNamespaces serviceBusNamespaces() {
     //    return serviceBusManager.operations();
     // }
 
-    /** @return entry point to managing Kubernetes clusters. */
+    /**
+     * Gets entry point to managing Kubernetes clusters.
+     *
+     * @return entry point to managing Kubernetes clusters.
+     */
     public KubernetesClusters kubernetesClusters() {
         return containerServiceManager.kubernetesClusters();
     }
 
-    /** @return entry point to managing Azure Container Instances. */
+    /**
+     * Gets entry point to managing Azure Container Instances.
+     *
+     * @return entry point to managing Azure Container Instances.
+     */
     public ContainerGroups containerGroups() {
         return containerInstanceManager.containerGroups();
     }
 
-    /** @return entry point to managing Container Registries. */
+    /**
+     * Gets entry point to managing Container Registries.
+     *
+     * @return entry point to managing Container Registries.
+     */
     public Registries containerRegistries() {
         return containerRegistryManager.containerRegistries();
     }
 
-    /** @return entry point to managing Container Registry RegistryTasks. */
+    /**
+     * Gets entry point to managing Container Registry RegistryTasks.
+     *
+     * @return entry point to managing Container Registry RegistryTasks.
+     */
     public RegistryTasks containerRegistryTasks() {
         return containerRegistryManager.containerRegistryTasks();
     }
 
-    /** @return entry point to managing Container Registry RegistryTask Runs. */
+    /**
+     * Gets entry point to managing Container Registry RegistryTask Runs.
+     *
+     * @return entry point to managing Container Registry RegistryTask Runs.
+     */
     public RegistryTaskRuns containerRegistryTaskRuns() {
         return containerRegistryManager.registryTaskRuns();
     }
 
-    /** @return entry point to managing Container Regsitries. */
+    /**
+     * Gets entry point to managing Container Regsitries.
+     *
+     * @return entry point to managing Container Regsitries.
+     */
     public CosmosDBAccounts cosmosDBAccounts() {
         return cosmosManager.databaseAccounts();
     }
 
     /**
+     * Gets entry point to managing Search services.
+     *
      * @return entry point to managing Search services.
      */
     public SearchServices searchServices() {
         return searchServiceManager.searchServices();
     }
 
-    /** @return entry point to managing Managed Service Identity (MSI) identities. */
+    /**
+     * Gets entry point to managing Managed Service Identity (MSI) identities.
+     *
+     * @return entry point to managing Managed Service Identity (MSI) identities.
+     */
     public Identities identities() {
         return msiManager.identities();
     }
 
-    /** @return entry point to authentication and authorization management in Azure */
+    /**
+     * Gets entry point to authentication and authorization management in Azure.
+     *
+     * @return entry point to authentication and authorization management in Azure
+     */
     public AccessManagement accessManagement() {
         return this.authenticated;
     }
 
-    /** @return entry point to listing activity log events in Azure */
+    /**
+     * Gets entry point to listing activity log events in Azure.
+     *
+     * @return entry point to listing activity log events in Azure
+     */
     public ActivityLogs activityLogs() {
         return this.monitorManager.activityLogs();
     }
 
-    /** @return entry point to listing metric definitions in Azure */
+    /**
+     * Gets entry point to listing metric definitions in Azure.
+     *
+     * @return entry point to listing metric definitions in Azure
+     */
     public MetricDefinitions metricDefinitions() {
         return this.monitorManager.metricDefinitions();
     }
 
-    /** @return entry point to listing diagnostic settings in Azure */
+    /**
+     * Gets entry point to listing diagnostic settings in Azure.
+     *
+     * @return entry point to listing diagnostic settings in Azure
+     */
     public DiagnosticSettings diagnosticSettings() {
         return this.monitorManager.diagnosticSettings();
     }
 
-    /** @return entry point to managing action groups in Azure */
+    /**
+     * Gets entry point to managing action groups in Azure.
+     *
+     * @return entry point to managing action groups in Azure
+     */
     public ActionGroups actionGroups() {
         return this.monitorManager.actionGroups();
     }
 
-    /** @return entry point to managing alertRules in Azure */
+    /**
+     * Gets entry point to managing alertRules in Azure.
+     *
+     * @return entry point to managing alertRules in Azure
+     */
     public AlertRules alertRules() {
         return this.monitorManager.alertRules();
     }
 
-    /** @return entry point to managing Autoscale Settings in Azure */
+    /**
+     * Gets entry point to managing Autoscale Settings in Azure.
+     *
+     * @return entry point to managing Autoscale Settings in Azure
+     */
     public AutoscaleSettings autoscaleSettings() {
         return this.monitorManager.autoscaleSettings();
     }
 
     /**
+     * Gets entry point to managing event hub namespaces.
+     *
      * @return entry point to managing event hub namespaces.
      */
     public EventHubNamespaces eventHubNamespaces() {
@@ -900,6 +1166,8 @@ public EventHubNamespaces eventHubNamespaces() {
     }
 
     /**
+     * Gets entry point to managing event hubs.
+     *
      * @return entry point to managing event hubs.
      */
     public EventHubs eventHubs() {
@@ -907,23 +1175,37 @@ public EventHubs eventHubs() {
     }
 
     /**
+     * Gets entry point to managing event hub namespace geo disaster recovery.
+     *
      * @return entry point to managing event hub namespace geo disaster recovery.
      */
     public EventHubDisasterRecoveryPairings eventHubDisasterRecoveryPairings() {
         return this.eventHubsManager.eventHubDisasterRecoveryPairings();
     }
 
-    /** @return entry point to manage compute galleries. */
+    /**
+     * Gets entry point to managing compute galleries.
+     *
+     * @return entry point to managing compute galleries.
+     */
     public Galleries galleries() {
         return this.computeManager.galleries();
     }
 
-    /** @return entry point to manage compute gallery images. */
+    /**
+     * Gets entry point to managing compute gallery images.
+     *
+     * @return entry point to managing compute gallery images.
+     */
     public GalleryImages galleryImages() {
         return this.computeManager.galleryImages();
     }
 
-    /** @return entry point to manage compute gallery image versions. */
+    /**
+     * Gets entry point to managing compute gallery image versions.
+     *
+     * @return entry point to managing compute gallery image versions.
+     */
     public GalleryImageVersions galleryImageVersions() {
         return this.computeManager.galleryImageVersions();
     }
@@ -952,47 +1234,83 @@ public BlobContainers storageBlobContainers() {
         return this.storageManager.blobContainers();
     }
 
-    /** @return the blob service management API entry point */
+    /**
+     * Gets the blob service management API entry point.
+     *
+     * @return the blob service management API entry point
+     */
     public BlobServices storageBlobServices() {
         return this.storageManager.blobServices();
     }
 
-    /** @return the blob service management API entry point */
+    /**
+     * Gets the blob service management API entry point.
+     *
+     * @return the blob service management API entry point
+     */
     public ManagementPolicies storageManagementPolicies() {
         return this.storageManager.managementPolicies();
     }
 
-    /** @return the spring service management API entry point */
+    /**
+     * Gets the spring service management API entry point.
+     *
+     * @return the spring service management API entry point
+     */
     public SpringServices springServices() {
         return this.appPlatformManager.springServices();
     }
 
-    /** @return the private DNS zone management API entry point */
+    /**
+     * Gets the private DNS zone management API entry point.
+     *
+     * @return the private DNS zone management API entry point
+     */
     public PrivateDnsZones privateDnsZones() {
         return this.privateDnsZoneManager.privateZones();
     }
 
-    /** @return entry point to private endpoints management */
+    /**
+     * Gets entry point to private endpoints management.
+     *
+     * @return entry point to private endpoints management
+     */
     public PrivateEndpoints privateEndpoints() {
         return this.networkManager.privateEndpoints();
     }
 
-    /** @return entry point to tag management management */
+    /**
+     * Gets entry point to tag management.
+     *
+     * @return entry point to tag management
+     */
     public TagOperations tagOperations() {
         return this.resourceManager.tagOperations();
     }
 
-    /** @return entry point to network profiles management */
+    /**
+     * Gets entry point to network profiles management.
+     *
+     * @return entry point to network profiles management
+     */
     public NetworkProfiles networkProfiles() {
         return this.networkManager.networkProfiles();
     }
 
-    /** @return entry point to disk encryption sets management */
+    /**
+     * Gets entry point to disk encryption sets management.
+     *
+     * @return entry point to disk encryption sets management
+     */
     public DiskEncryptionSets diskEncryptionSets() {
         return this.computeManager.diskEncryptionSets();
     }
 
-    /** @return entry point to Managed Hardware Security Module management */
+    /**
+     * Gets entry point to Managed Hardware Security Module management.
+     *
+     * @return entry point to Managed Hardware Security Module management
+     */
     public ManagedHsms managedHsms() {
         return this.keyVaultManager.managedHsms();
     }