Shared - a shared instance is a regional instance which is available to all customers.
* It does NOT support customer specified policy documents - there is only a default policy available
* for each attestation type
- * AAD - An attestation instance where the customer trusts Azure Active Directory (and Azure
+ * AAD - An attestation instance where the customer trusts Microsoft Entra ID (and Azure
* Role Based Access Control) to manage the security of their enclave.
- * Isolated - an attestation instance where the customer does *not* trust Azure Active Directory
+ * Isolated - an attestation instance where the customer does *not* trust Microsoft Entra ID
* (and RBAC) to manage the security of their enclave
*
*
diff --git a/sdk/attestation/azure-security-attestation/src/main/java/com/azure/security/attestation/AttestationAdministrationClient.java b/sdk/attestation/azure-security-attestation/src/main/java/com/azure/security/attestation/AttestationAdministrationClient.java
index 7df26e993bfc..3b419c827ec1 100644
--- a/sdk/attestation/azure-security-attestation/src/main/java/com/azure/security/attestation/AttestationAdministrationClient.java
+++ b/sdk/attestation/azure-security-attestation/src/main/java/com/azure/security/attestation/AttestationAdministrationClient.java
@@ -39,9 +39,9 @@
* Shared - a shared instance is a regional instance which is available to all customers.
* It does NOT support customer specified policy documents - there is only a default policy available
* for each attestation type
- * AAD - An attestation instance where the customer trusts Azure Active Directory (and Azure
+ * AAD - An attestation instance where the customer trusts Microsoft Entra ID (and Azure
* Role Based Access Control) to manage the security of their enclave.
- * Isolated - an attestation instance where the customer does *not* trust Azure Active Directory
+ * Isolated - an attestation instance where the customer does *not* trust Microsoft Entra ID
* (and RBAC) to manage the security of their enclave
*
*
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphAdministrativeUnit.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphAdministrativeUnit.java
index d35c9215179f..dccb7ec2bbfb 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphAdministrativeUnit.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphAdministrativeUnit.java
@@ -19,7 +19,7 @@
/**
* Represents an administrative unit.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
@@ -59,7 +59,7 @@ public final class MicrosoftGraphAdministrativeUnit extends MicrosoftGraphDirect
private List extensions;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -200,7 +200,7 @@ public MicrosoftGraphAdministrativeUnit withExtensions(List additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphAppRoleAssignment.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphAppRoleAssignment.java
index f20410f29939..9b40f18159ea 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphAppRoleAssignment.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphAppRoleAssignment.java
@@ -20,7 +20,7 @@
/**
* Represents an app role assignment.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
@@ -70,7 +70,7 @@ public final class MicrosoftGraphAppRoleAssignment extends MicrosoftGraphDirecto
private UUID resourceId;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -240,7 +240,7 @@ public MicrosoftGraphAppRoleAssignment withResourceId(UUID resourceId) {
}
/**
- * Get the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Get the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @return the additionalProperties value.
@@ -250,7 +250,7 @@ public Map additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphApplicationInner.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphApplicationInner.java
index 10a19cd9d472..a79dae67cb78 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphApplicationInner.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphApplicationInner.java
@@ -22,7 +22,7 @@
/**
* Represents an application.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
@@ -189,7 +189,7 @@ public final class MicrosoftGraphApplicationInner extends MicrosoftGraphDirector
private MicrosoftGraphWebApplication web;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private MicrosoftGraphDirectoryObjectInner createdOnBehalfOf;
@@ -221,7 +221,7 @@ public final class MicrosoftGraphApplicationInner extends MicrosoftGraphDirector
private List tokenLifetimePolicies;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -839,7 +839,7 @@ public MicrosoftGraphApplicationInner withWeb(MicrosoftGraphWebApplication web)
}
/**
- * Get the createdOnBehalfOf property: Represents an Azure Active Directory object. The directoryObject type is the
+ * Get the createdOnBehalfOf property: Represents an Microsoft Entra ID object. The directoryObject type is the
* base type for many other directory entity types.
*
* @return the createdOnBehalfOf value.
@@ -849,7 +849,7 @@ public MicrosoftGraphDirectoryObjectInner createdOnBehalfOf() {
}
/**
- * Set the createdOnBehalfOf property: Represents an Azure Active Directory object. The directoryObject type is the
+ * Set the createdOnBehalfOf property: Represents an Microsoft Entra ID object. The directoryObject type is the
* base type for many other directory entity types.
*
* @param createdOnBehalfOf the createdOnBehalfOf value to set.
@@ -967,7 +967,7 @@ public List tokenLifetimePolicies() {
}
/**
- * Get the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Get the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @return the additionalProperties value.
@@ -977,7 +977,7 @@ public Map additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphBaseItemInner.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphBaseItemInner.java
index 94b36463d414..e1c385cda791 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphBaseItemInner.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphBaseItemInner.java
@@ -66,12 +66,12 @@ public class MicrosoftGraphBaseItemInner extends MicrosoftGraphEntity {
private String webUrl;
/*
- * Represents an Azure Active Directory user object.
+ * Represents an Microsoft Entra ID user object.
*/
private MicrosoftGraphUserInner createdByUser;
/*
- * Represents an Azure Active Directory user object.
+ * Represents an Microsoft Entra ID user object.
*/
private MicrosoftGraphUserInner lastModifiedByUser;
@@ -267,7 +267,7 @@ public MicrosoftGraphBaseItemInner withWebUrl(String webUrl) {
}
/**
- * Get the createdByUser property: Represents an Azure Active Directory user object.
+ * Get the createdByUser property: Represents an Microsoft Entra ID user object.
*
* @return the createdByUser value.
*/
@@ -276,7 +276,7 @@ public MicrosoftGraphUserInner createdByUser() {
}
/**
- * Set the createdByUser property: Represents an Azure Active Directory user object.
+ * Set the createdByUser property: Represents an Microsoft Entra ID user object.
*
* @param createdByUser the createdByUser value to set.
* @return the MicrosoftGraphBaseItemInner object itself.
@@ -287,7 +287,7 @@ public MicrosoftGraphBaseItemInner withCreatedByUser(MicrosoftGraphUserInner cre
}
/**
- * Get the lastModifiedByUser property: Represents an Azure Active Directory user object.
+ * Get the lastModifiedByUser property: Represents an Microsoft Entra ID user object.
*
* @return the lastModifiedByUser value.
*/
@@ -296,7 +296,7 @@ public MicrosoftGraphUserInner lastModifiedByUser() {
}
/**
- * Set the lastModifiedByUser property: Represents an Azure Active Directory user object.
+ * Set the lastModifiedByUser property: Represents an Microsoft Entra ID user object.
*
* @param lastModifiedByUser the lastModifiedByUser value to set.
* @return the MicrosoftGraphBaseItemInner object itself.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphClaimsMappingPolicy.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphClaimsMappingPolicy.java
index e4a7a23aca02..16d18758b021 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphClaimsMappingPolicy.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphClaimsMappingPolicy.java
@@ -19,13 +19,13 @@
/**
* Represents a claims mapping policy.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
public final class MicrosoftGraphClaimsMappingPolicy extends MicrosoftGraphStsPolicy {
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -37,7 +37,7 @@ public MicrosoftGraphClaimsMappingPolicy() {
}
/**
- * Get the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Get the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @return the additionalProperties value.
@@ -47,7 +47,7 @@ public Map additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphContract.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphContract.java
index 6043b2f91d58..315a9a06bf30 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphContract.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphContract.java
@@ -20,7 +20,7 @@
/**
* Represents a contract.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
@@ -54,7 +54,7 @@ public final class MicrosoftGraphContract extends MicrosoftGraphDirectoryObjectI
private String displayName;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -164,7 +164,7 @@ public MicrosoftGraphContract withDisplayName(String displayName) {
}
/**
- * Get the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Get the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @return the additionalProperties value.
@@ -174,7 +174,7 @@ public Map additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDevice.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDevice.java
index 51435be73bd7..c121af7b478c 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDevice.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDevice.java
@@ -19,7 +19,7 @@
/**
* Represents a device.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
@@ -126,7 +126,7 @@ public final class MicrosoftGraphDevice extends MicrosoftGraphDirectoryObjectInn
/*
* Type of trust for the joined device. Read-only. Possible values: Workplace - indicates bring your own personal
* devicesAzureAd - Cloud only joined devicesServerAd - on-premises domain joined devices joined to Azure AD. For
- * more details, see Introduction to device management in Azure Active Directory
+ * more details, see Introduction to device management in Microsoft Entra ID
*/
private String trustType;
@@ -158,7 +158,7 @@ public final class MicrosoftGraphDevice extends MicrosoftGraphDirectoryObjectInn
private List extensions;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -561,7 +561,7 @@ public MicrosoftGraphDevice withSystemLabels(List systemLabels) {
/**
* Get the trustType property: Type of trust for the joined device. Read-only. Possible values: Workplace -
* indicates bring your own personal devicesAzureAd - Cloud only joined devicesServerAd - on-premises domain joined
- * devices joined to Azure AD. For more details, see Introduction to device management in Azure Active Directory.
+ * devices joined to Azure AD. For more details, see Introduction to device management in Microsoft Entra ID.
*
* @return the trustType value.
*/
@@ -572,7 +572,7 @@ public String trustType() {
/**
* Set the trustType property: Type of trust for the joined device. Read-only. Possible values: Workplace -
* indicates bring your own personal devicesAzureAd - Cloud only joined devicesServerAd - on-premises domain joined
- * devices joined to Azure AD. For more details, see Introduction to device management in Azure Active Directory.
+ * devices joined to Azure AD. For more details, see Introduction to device management in Microsoft Entra ID.
*
* @param trustType the trustType value to set.
* @return the MicrosoftGraphDevice object itself.
@@ -691,7 +691,7 @@ public MicrosoftGraphDevice withExtensions(List extensi
}
/**
- * Get the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Get the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @return the additionalProperties value.
@@ -701,7 +701,7 @@ public Map additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDeviceCategory.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDeviceCategory.java
index 8b5e4b366960..c80c62292ce9 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDeviceCategory.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDeviceCategory.java
@@ -36,7 +36,7 @@ public final class MicrosoftGraphDeviceCategory extends MicrosoftGraphEntity {
* Device categories provides a way to organize your devices. Using device categories, company administrators can
* define their own categories that make sense to their company. These categories can then be applied to a device in
* the Intune Azure console or selected by a user during device enrollment. You can filter reports and create
- * dynamic Azure Active Directory device groups based on device categories.
+ * dynamic Microsoft Entra ID device groups based on device categories.
*/
private Map additionalProperties;
@@ -90,7 +90,7 @@ public MicrosoftGraphDeviceCategory withDisplayName(String displayName) {
* Get the additionalProperties property: Device categories provides a way to organize your devices. Using device
* categories, company administrators can define their own categories that make sense to their company. These
* categories can then be applied to a device in the Intune Azure console or selected by a user during device
- * enrollment. You can filter reports and create dynamic Azure Active Directory device groups based on device
+ * enrollment. You can filter reports and create dynamic Microsoft Entra ID device groups based on device
* categories.
*
* @return the additionalProperties value.
@@ -103,7 +103,7 @@ public Map additionalProperties() {
* Set the additionalProperties property: Device categories provides a way to organize your devices. Using device
* categories, company administrators can define their own categories that make sense to their company. These
* categories can then be applied to a device in the Intune Azure console or selected by a user during device
- * enrollment. You can filter reports and create dynamic Azure Active Directory device groups based on device
+ * enrollment. You can filter reports and create dynamic Microsoft Entra ID device groups based on device
* categories.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDirectoryObjectInner.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDirectoryObjectInner.java
index 3d028e66efe1..4ec86e9e1dd7 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDirectoryObjectInner.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDirectoryObjectInner.java
@@ -18,7 +18,7 @@
/**
* Represents a directory object.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
@@ -29,7 +29,7 @@ public class MicrosoftGraphDirectoryObjectInner extends MicrosoftGraphEntity {
private OffsetDateTime deletedDateTime;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -61,7 +61,7 @@ public MicrosoftGraphDirectoryObjectInner withDeletedDateTime(OffsetDateTime del
}
/**
- * Get the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Get the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @return the additionalProperties value.
@@ -71,7 +71,7 @@ public Map additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDirectoryRole.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDirectoryRole.java
index 297b99724265..0475f036ad40 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDirectoryRole.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDirectoryRole.java
@@ -19,7 +19,7 @@
/**
* Represents a directory role.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
@@ -52,7 +52,7 @@ public final class MicrosoftGraphDirectoryRole extends MicrosoftGraphDirectoryOb
private List scopedMembers;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -170,7 +170,7 @@ public MicrosoftGraphDirectoryRole withScopedMembers(List additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDirectoryRoleTemplate.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDirectoryRoleTemplate.java
index 666c85420adb..0223afbe5422 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDirectoryRoleTemplate.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphDirectoryRoleTemplate.java
@@ -18,7 +18,7 @@
/**
* Represents a directory role template.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
@@ -34,7 +34,7 @@ public final class MicrosoftGraphDirectoryRoleTemplate extends MicrosoftGraphDir
private String displayName;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -86,7 +86,7 @@ public MicrosoftGraphDirectoryRoleTemplate withDisplayName(String displayName) {
}
/**
- * Get the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Get the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @return the additionalProperties value.
@@ -96,7 +96,7 @@ public Map additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphEndpoint.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphEndpoint.java
index ab9f965b9059..0a1d77e86e18 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphEndpoint.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphEndpoint.java
@@ -18,7 +18,7 @@
/**
* Represents an endpoint.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
@@ -51,7 +51,7 @@ public final class MicrosoftGraphEndpoint extends MicrosoftGraphDirectoryObjectI
private String uri;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -167,7 +167,7 @@ public MicrosoftGraphEndpoint withUri(String uri) {
}
/**
- * Get the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Get the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @return the additionalProperties value.
@@ -177,7 +177,7 @@ public Map additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphExtensionPropertyInner.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphExtensionPropertyInner.java
index 0d8a05a82f0d..268a862c735e 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphExtensionPropertyInner.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphExtensionPropertyInner.java
@@ -19,7 +19,7 @@
/**
* Represents an extension property.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
@@ -52,7 +52,7 @@ public final class MicrosoftGraphExtensionPropertyInner extends MicrosoftGraphDi
private List targetObjects;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -174,7 +174,7 @@ public MicrosoftGraphExtensionPropertyInner withTargetObjects(List targe
}
/**
- * Get the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Get the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @return the additionalProperties value.
@@ -184,7 +184,7 @@ public Map additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphGroupInner.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphGroupInner.java
index 8ac4a58f073e..942a6dda565f 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphGroupInner.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphGroupInner.java
@@ -19,7 +19,7 @@
/**
* Represents a group.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
@@ -140,7 +140,7 @@ public final class MicrosoftGraphGroupInner extends MicrosoftGraphDirectoryObjec
/*
* Contains the on-premises SAM account name synchronized from the on-premises directory. The property is only
- * populated for customers who are synchronizing their on-premises directory to Azure Active Directory via Azure AD
+ * populated for customers who are synchronizing their on-premises directory to Microsoft Entra ID via Azure AD
* Connect.Returned by default. Read-only.
*/
private String onPremisesSamAccountName;
@@ -256,7 +256,7 @@ public final class MicrosoftGraphGroupInner extends MicrosoftGraphDirectoryObjec
private List appRoleAssignments;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private MicrosoftGraphDirectoryObjectInner createdOnBehalfOf;
@@ -393,7 +393,7 @@ public final class MicrosoftGraphGroupInner extends MicrosoftGraphDirectoryObjec
private MicrosoftGraphTeamInner team;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -831,7 +831,7 @@ public List onPremisesProvisioningErr
/**
* Get the onPremisesSamAccountName property: Contains the on-premises SAM account name synchronized from the
* on-premises directory. The property is only populated for customers who are synchronizing their on-premises
- * directory to Azure Active Directory via Azure AD Connect.Returned by default. Read-only.
+ * directory to Microsoft Entra ID via Azure AD Connect.Returned by default. Read-only.
*
* @return the onPremisesSamAccountName value.
*/
@@ -842,7 +842,7 @@ public String onPremisesSamAccountName() {
/**
* Set the onPremisesSamAccountName property: Contains the on-premises SAM account name synchronized from the
* on-premises directory. The property is only populated for customers who are synchronizing their on-premises
- * directory to Azure Active Directory via Azure AD Connect.Returned by default. Read-only.
+ * directory to Microsoft Entra ID via Azure AD Connect.Returned by default. Read-only.
*
* @param onPremisesSamAccountName the onPremisesSamAccountName value to set.
* @return the MicrosoftGraphGroupInner object itself.
@@ -1257,7 +1257,7 @@ public MicrosoftGraphGroupInner withAppRoleAssignments(List additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphHomeRealmDiscoveryPolicyInner.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphHomeRealmDiscoveryPolicyInner.java
index 793dc29ed338..98be7127813a 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphHomeRealmDiscoveryPolicyInner.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphHomeRealmDiscoveryPolicyInner.java
@@ -19,13 +19,13 @@
/**
* Represents a home realm discovery policy.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
public final class MicrosoftGraphHomeRealmDiscoveryPolicyInner extends MicrosoftGraphStsPolicy {
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -37,7 +37,7 @@ public MicrosoftGraphHomeRealmDiscoveryPolicyInner() {
}
/**
- * Get the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Get the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @return the additionalProperties value.
@@ -47,7 +47,7 @@ public Map additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphManagedDevice.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphManagedDevice.java
index 5ce7f6f620ab..9d572cfd651d 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphManagedDevice.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphManagedDevice.java
@@ -34,12 +34,12 @@ public final class MicrosoftGraphManagedDevice extends MicrosoftGraphEntity {
private String androidSecurityPatchLevel;
/*
- * The unique identifier for the Azure Active Directory device. Read only.
+ * The unique identifier for the Microsoft Entra ID device. Read only.
*/
private String azureADDeviceId;
/*
- * Whether the device is Azure Active Directory registered.
+ * Whether the device is Microsoft Entra ID registered.
*/
private Boolean azureADRegistered;
@@ -267,7 +267,7 @@ public final class MicrosoftGraphManagedDevice extends MicrosoftGraphEntity {
* Device categories provides a way to organize your devices. Using device categories, company administrators can
* define their own categories that make sense to their company. These categories can then be applied to a device in
* the Intune Azure console or selected by a user during device enrollment. You can filter reports and create
- * dynamic Azure Active Directory device groups based on device categories.
+ * dynamic Microsoft Entra ID device groups based on device categories.
*/
private MicrosoftGraphDeviceCategory deviceCategory;
@@ -323,7 +323,7 @@ public MicrosoftGraphManagedDevice withAndroidSecurityPatchLevel(String androidS
}
/**
- * Get the azureADDeviceId property: The unique identifier for the Azure Active Directory device. Read only.
+ * Get the azureADDeviceId property: The unique identifier for the Microsoft Entra ID device. Read only.
*
* @return the azureADDeviceId value.
*/
@@ -332,7 +332,7 @@ public String azureADDeviceId() {
}
/**
- * Set the azureADDeviceId property: The unique identifier for the Azure Active Directory device. Read only.
+ * Set the azureADDeviceId property: The unique identifier for the Microsoft Entra ID device. Read only.
*
* @param azureADDeviceId the azureADDeviceId value to set.
* @return the MicrosoftGraphManagedDevice object itself.
@@ -343,7 +343,7 @@ public MicrosoftGraphManagedDevice withAzureADDeviceId(String azureADDeviceId) {
}
/**
- * Get the azureADRegistered property: Whether the device is Azure Active Directory registered.
+ * Get the azureADRegistered property: Whether the device is Microsoft Entra ID registered.
*
* @return the azureADRegistered value.
*/
@@ -352,7 +352,7 @@ public Boolean azureADRegistered() {
}
/**
- * Set the azureADRegistered property: Whether the device is Azure Active Directory registered.
+ * Set the azureADRegistered property: Whether the device is Microsoft Entra ID registered.
*
* @param azureADRegistered the azureADRegistered value to set.
* @return the MicrosoftGraphManagedDevice object itself.
@@ -1270,7 +1270,7 @@ public List deviceConfigurationStates()
* Get the deviceCategory property: Device categories provides a way to organize your devices. Using device
* categories, company administrators can define their own categories that make sense to their company. These
* categories can then be applied to a device in the Intune Azure console or selected by a user during device
- * enrollment. You can filter reports and create dynamic Azure Active Directory device groups based on device
+ * enrollment. You can filter reports and create dynamic Microsoft Entra ID device groups based on device
* categories.
*
* @return the deviceCategory value.
@@ -1283,7 +1283,7 @@ public MicrosoftGraphDeviceCategory deviceCategory() {
* Set the deviceCategory property: Device categories provides a way to organize your devices. Using device
* categories, company administrators can define their own categories that make sense to their company. These
* categories can then be applied to a device in the Intune Azure console or selected by a user during device
- * enrollment. You can filter reports and create dynamic Azure Active Directory device groups based on device
+ * enrollment. You can filter reports and create dynamic Microsoft Entra ID device groups based on device
* categories.
*
* @param deviceCategory the deviceCategory value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphOrgContactInner.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphOrgContactInner.java
index 49f2ab52c1c3..acbabd85d755 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphOrgContactInner.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphOrgContactInner.java
@@ -19,7 +19,7 @@
/**
* Represents an org contact.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
@@ -100,7 +100,7 @@ public final class MicrosoftGraphOrgContactInner extends MicrosoftGraphDirectory
private List directReports;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private MicrosoftGraphDirectoryObjectInner manager;
@@ -116,7 +116,7 @@ public final class MicrosoftGraphOrgContactInner extends MicrosoftGraphDirectory
private List transitiveMemberOf;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -429,7 +429,7 @@ public MicrosoftGraphOrgContactInner withDirectReports(List transitiveMemberOf() {
}
/**
- * Get the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Get the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @return the additionalProperties value.
@@ -502,7 +502,7 @@ public Map additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphPolicyBase.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphPolicyBase.java
index ca6d11504d6e..7e000cbe0ea5 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphPolicyBase.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphPolicyBase.java
@@ -18,7 +18,7 @@
/**
* Represents a policy base.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
@@ -34,7 +34,7 @@ public class MicrosoftGraphPolicyBase extends MicrosoftGraphDirectoryObjectInner
private String displayName;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -86,7 +86,7 @@ public MicrosoftGraphPolicyBase withDisplayName(String displayName) {
}
/**
- * Get the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Get the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @return the additionalProperties value.
@@ -96,7 +96,7 @@ public Map additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphResourceSpecificPermissionGrant.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphResourceSpecificPermissionGrant.java
index ef43e33d5fd3..a64c0335eefc 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphResourceSpecificPermissionGrant.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphResourceSpecificPermissionGrant.java
@@ -18,7 +18,7 @@
/**
* Represents a resource specific permission grant.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
@@ -49,7 +49,7 @@ public final class MicrosoftGraphResourceSpecificPermissionGrant extends Microso
private String resourceAppId;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -161,7 +161,7 @@ public MicrosoftGraphResourceSpecificPermissionGrant withResourceAppId(String re
}
/**
- * Get the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Get the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @return the additionalProperties value.
@@ -171,7 +171,7 @@ public Map additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphServicePrincipalInner.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphServicePrincipalInner.java
index e6d2ab4ab4a9..caf96d2bfc15 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphServicePrincipalInner.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphServicePrincipalInner.java
@@ -21,7 +21,7 @@
/**
* Represents a service principal.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
@@ -275,7 +275,7 @@ public final class MicrosoftGraphServicePrincipalInner extends MicrosoftGraphDir
private List transitiveMemberOf;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -1258,7 +1258,7 @@ public List transitiveMemberOf() {
}
/**
- * Get the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Get the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @return the additionalProperties value.
@@ -1268,7 +1268,7 @@ public Map additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphStsPolicy.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphStsPolicy.java
index 15b4784a1efa..f3f360bad1f3 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphStsPolicy.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphStsPolicy.java
@@ -19,7 +19,7 @@
/**
* Represents a sts policy.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
@@ -42,7 +42,7 @@ public class MicrosoftGraphStsPolicy extends MicrosoftGraphPolicyBase {
private List appliesTo;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -118,7 +118,7 @@ public MicrosoftGraphStsPolicy withAppliesTo(List additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphTeamInner.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphTeamInner.java
index b468fb7c4acc..8fa5d102c7b0 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphTeamInner.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphTeamInner.java
@@ -93,7 +93,7 @@ public final class MicrosoftGraphTeamInner extends MicrosoftGraphEntity {
private List channels;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private MicrosoftGraphGroupInner group;
@@ -423,7 +423,7 @@ public MicrosoftGraphTeamInner withChannels(List channels
}
/**
- * Get the group property: Represents an Azure Active Directory object. The directoryObject type is the base type
+ * Get the group property: Represents an Microsoft Entra ID object. The directoryObject type is the base type
* for many other directory entity types.
*
* @return the group value.
@@ -433,7 +433,7 @@ public MicrosoftGraphGroupInner group() {
}
/**
- * Set the group property: Represents an Azure Active Directory object. The directoryObject type is the base type
+ * Set the group property: Represents an Microsoft Entra ID object. The directoryObject type is the base type
* for many other directory entity types.
*
* @param group the group value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphTokenIssuancePolicy.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphTokenIssuancePolicy.java
index ea7806c902d4..c95899f633d0 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphTokenIssuancePolicy.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphTokenIssuancePolicy.java
@@ -19,13 +19,13 @@
/**
* Represents a token issuance policy.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
public final class MicrosoftGraphTokenIssuancePolicy extends MicrosoftGraphStsPolicy {
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -37,7 +37,7 @@ public MicrosoftGraphTokenIssuancePolicy() {
}
/**
- * Get the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Get the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @return the additionalProperties value.
@@ -47,7 +47,7 @@ public Map additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphTokenLifetimePolicy.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphTokenLifetimePolicy.java
index 5d557d9e4cdc..6baf649b5f98 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphTokenLifetimePolicy.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphTokenLifetimePolicy.java
@@ -19,13 +19,13 @@
/**
* Represents a token lifetime policy.
*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
@Fluent
public final class MicrosoftGraphTokenLifetimePolicy extends MicrosoftGraphStsPolicy {
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private Map additionalProperties;
@@ -37,7 +37,7 @@ public MicrosoftGraphTokenLifetimePolicy() {
}
/**
- * Get the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Get the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @return the additionalProperties value.
@@ -47,7 +47,7 @@ public Map additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory object. The directoryObject type is
+ * Set the additionalProperties property: Represents an Microsoft Entra ID object. The directoryObject type is
* the base type for many other directory entity types.
*
* @param additionalProperties the additionalProperties value to set.
diff --git a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphUserInner.java b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphUserInner.java
index df86f8559481..cb0ab7d84a2f 100644
--- a/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphUserInner.java
+++ b/sdk/authorization/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/fluent/models/MicrosoftGraphUserInner.java
@@ -19,7 +19,7 @@
/**
* Represents an user.
*
- * Represents an Azure Active Directory user object.
+ * Represents an Microsoft Entra ID user object.
*/
@Fluent
public final class MicrosoftGraphUserInner extends MicrosoftGraphDirectoryObjectInner {
@@ -80,7 +80,7 @@ public final class MicrosoftGraphUserInner extends MicrosoftGraphDirectoryObject
/*
* Indicates whether the user account was created as a regular school or work account (null), an external account
- * (Invitation), a local account for an Azure Active Directory B2C tenant (LocalAccount) or self-service sign-up
+ * (Invitation), a local account for an Microsoft Entra ID B2C tenant (LocalAccount) or self-service sign-up
* using email verification (EmailVerified). Read-only.
*/
private String creationType;
@@ -203,7 +203,7 @@ public final class MicrosoftGraphUserInner extends MicrosoftGraphDirectoryObject
/*
* Contains the on-premises Active Directory distinguished name or DN. The property is only populated for customers
- * who are synchronizing their on-premises directory to Azure Active Directory via Azure AD Connect. Read-only.
+ * who are synchronizing their on-premises directory to Microsoft Entra ID via Azure AD Connect. Read-only.
*/
private String onPremisesDistinguishedName;
@@ -239,7 +239,7 @@ public final class MicrosoftGraphUserInner extends MicrosoftGraphDirectoryObject
/*
* Contains the on-premises samAccountName synchronized from the on-premises directory. The property is only
- * populated for customers who are synchronizing their on-premises directory to Azure Active Directory via Azure AD
+ * populated for customers who are synchronizing their on-premises directory to Microsoft Entra ID via Azure AD
* Connect. Read-only.
*/
private String onPremisesSamAccountName;
@@ -259,7 +259,7 @@ public final class MicrosoftGraphUserInner extends MicrosoftGraphDirectoryObject
/*
* Contains the on-premises userPrincipalName synchronized from the on-premises directory. The property is only
- * populated for customers who are synchronizing their on-premises directory to Azure Active Directory via Azure AD
+ * populated for customers who are synchronizing their on-premises directory to Microsoft Entra ID via Azure AD
* Connect. Read-only.
*/
private String onPremisesUserPrincipalName;
@@ -437,7 +437,7 @@ public final class MicrosoftGraphUserInner extends MicrosoftGraphDirectoryObject
private List licenseDetails;
/*
- * Represents an Azure Active Directory object. The directoryObject type is the base type for many other directory
+ * Represents an Microsoft Entra ID object. The directoryObject type is the base type for many other directory
* entity types.
*/
private MicrosoftGraphDirectoryObjectInner manager;
@@ -633,7 +633,7 @@ public final class MicrosoftGraphUserInner extends MicrosoftGraphDirectoryObject
private MicrosoftGraphTodo todo;
/*
- * Represents an Azure Active Directory user object.
+ * Represents an Microsoft Entra ID user object.
*/
private Map additionalProperties;
@@ -859,7 +859,7 @@ public MicrosoftGraphUserInner withCreatedDateTime(OffsetDateTime createdDateTim
/**
* Get the creationType property: Indicates whether the user account was created as a regular school or work account
- * (null), an external account (Invitation), a local account for an Azure Active Directory B2C tenant (LocalAccount)
+ * (null), an external account (Invitation), a local account for an Microsoft Entra ID B2C tenant (LocalAccount)
* or self-service sign-up using email verification (EmailVerified). Read-only.
*
* @return the creationType value.
@@ -870,7 +870,7 @@ public String creationType() {
/**
* Set the creationType property: Indicates whether the user account was created as a regular school or work account
- * (null), an external account (Invitation), a local account for an Azure Active Directory B2C tenant (LocalAccount)
+ * (null), an external account (Invitation), a local account for an Microsoft Entra ID B2C tenant (LocalAccount)
* or self-service sign-up using email verification (EmailVerified). Read-only.
*
* @param creationType the creationType value to set.
@@ -1365,7 +1365,7 @@ public MicrosoftGraphUserInner withOnPremisesDistinguishedName(String onPremises
/**
* Get the onPremisesDomainName property: Contains the on-premises domainFQDN, also called dnsDomainName
* synchronized from the on-premises directory. The property is only populated for customers who are synchronizing
- * their on-premises directory to Azure Active Directory via Azure AD Connect. Read-only.
+ * their on-premises directory to Microsoft Entra ID via Azure AD Connect. Read-only.
*
* @return the onPremisesDomainName value.
*/
@@ -1376,7 +1376,7 @@ public String onPremisesDomainName() {
/**
* Set the onPremisesDomainName property: Contains the on-premises domainFQDN, also called dnsDomainName
* synchronized from the on-premises directory. The property is only populated for customers who are synchronizing
- * their on-premises directory to Azure Active Directory via Azure AD Connect. Read-only.
+ * their on-premises directory to Microsoft Entra ID via Azure AD Connect. Read-only.
*
* @param onPremisesDomainName the onPremisesDomainName value to set.
* @return the MicrosoftGraphUserInner object itself.
@@ -1479,7 +1479,7 @@ public List onPremisesProvisioningErr
/**
* Get the onPremisesSamAccountName property: Contains the on-premises samAccountName synchronized from the
* on-premises directory. The property is only populated for customers who are synchronizing their on-premises
- * directory to Azure Active Directory via Azure AD Connect. Read-only.
+ * directory to Microsoft Entra ID via Azure AD Connect. Read-only.
*
* @return the onPremisesSamAccountName value.
*/
@@ -1490,7 +1490,7 @@ public String onPremisesSamAccountName() {
/**
* Set the onPremisesSamAccountName property: Contains the on-premises samAccountName synchronized from the
* on-premises directory. The property is only populated for customers who are synchronizing their on-premises
- * directory to Azure Active Directory via Azure AD Connect. Read-only.
+ * directory to Microsoft Entra ID via Azure AD Connect. Read-only.
*
* @param onPremisesSamAccountName the onPremisesSamAccountName value to set.
* @return the MicrosoftGraphUserInner object itself.
@@ -1549,7 +1549,7 @@ public MicrosoftGraphUserInner withOnPremisesSyncEnabled(Boolean onPremisesSyncE
/**
* Get the onPremisesUserPrincipalName property: Contains the on-premises userPrincipalName synchronized from the
* on-premises directory. The property is only populated for customers who are synchronizing their on-premises
- * directory to Azure Active Directory via Azure AD Connect. Read-only.
+ * directory to Microsoft Entra ID via Azure AD Connect. Read-only.
*
* @return the onPremisesUserPrincipalName value.
*/
@@ -1560,7 +1560,7 @@ public String onPremisesUserPrincipalName() {
/**
* Set the onPremisesUserPrincipalName property: Contains the on-premises userPrincipalName synchronized from the
* on-premises directory. The property is only populated for customers who are synchronizing their on-premises
- * directory to Azure Active Directory via Azure AD Connect. Read-only.
+ * directory to Microsoft Entra ID via Azure AD Connect. Read-only.
*
* @param onPremisesUserPrincipalName the onPremisesUserPrincipalName value to set.
* @return the MicrosoftGraphUserInner object itself.
@@ -2237,7 +2237,7 @@ public MicrosoftGraphUserInner withLicenseDetails(List additionalProperties() {
}
/**
- * Set the additionalProperties property: Represents an Azure Active Directory user object.
+ * Set the additionalProperties property: Represents an Microsoft Entra ID user object.
*
* @param additionalProperties the additionalProperties value to set.
* @return the MicrosoftGraphUserInner object itself.
diff --git a/sdk/azureadexternalidentities/azure-resourcemanager-azureadexternalidentities/README.md b/sdk/azureadexternalidentities/azure-resourcemanager-azureadexternalidentities/README.md
index f82187dc9b7c..9c7ff71256d6 100644
--- a/sdk/azureadexternalidentities/azure-resourcemanager-azureadexternalidentities/README.md
+++ b/sdk/azureadexternalidentities/azure-resourcemanager-azureadexternalidentities/README.md
@@ -45,7 +45,7 @@ Azure Management Libraries require a `TokenCredential` implementation for authen
### Authentication
-By default, Azure Active Directory token authentication depends on correct configure of following environment variables.
+By default, Microsoft Entra ID token authentication depends on correct configure of following environment variables.
- `AZURE_CLIENT_ID` for Azure client ID.
- `AZURE_TENANT_ID` for Azure tenant ID.
diff --git a/sdk/batch/microsoft-azure-batch/README.md b/sdk/batch/microsoft-azure-batch/README.md
index c2ac974f9ac1..9b3bd9e40196 100644
--- a/sdk/batch/microsoft-azure-batch/README.md
+++ b/sdk/batch/microsoft-azure-batch/README.md
@@ -19,7 +19,7 @@ BatchSharedKeyCredentials cred = new BatchSharedKeyCredentials(batchUri, batchAc
BatchClient client = BatchClient.open(cred);
```
-* The other way is using AAD (Azure Active Directory) authentication to create the client. See this [document](https://learn.microsoft.com/azure/batch/batch-aad-auth) for detail.
+* The other way is using AAD (Microsoft Entra ID) authentication to create the client. See this [document](https://learn.microsoft.com/azure/batch/batch-aad-auth) for detail.
```java
BatchApplicationTokenCredentials cred = new BatchApplicationTokenCredentials(batchEndpoint, clientId, applicationSecret, applicationDomain, null, null);
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/UserAssignedIdentity.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/UserAssignedIdentity.java
index 075f29630ef0..2c6bddcf5a9d 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/UserAssignedIdentity.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/UserAssignedIdentity.java
@@ -17,7 +17,7 @@
@Immutable
public final class UserAssignedIdentity implements JsonSerializable {
/*
- * Azure Active Directory principal ID associated with this Identity.
+ * Microsoft Entra ID principal ID associated with this Identity.
*/
private String principalId;
@@ -33,7 +33,7 @@ public UserAssignedIdentity() {
}
/**
- * Get the principalId property: Azure Active Directory principal ID associated with this Identity.
+ * Get the principalId property: Microsoft Entra ID principal ID associated with this Identity.
*
* @return the principalId value.
*/
diff --git a/sdk/communication/azure-communication-email/README.md b/sdk/communication/azure-communication-email/README.md
index 70257672d2ea..a54cb82ddbb5 100644
--- a/sdk/communication/azure-communication-email/README.md
+++ b/sdk/communication/azure-communication-email/README.md
@@ -95,7 +95,7 @@ EmailClient emailClient = new EmailClientBuilder()
.buildClient();
```
-### Azure Active Directory Token Authentication
+### Microsoft Entra ID Token Authentication
A `DefaultAzureCredential` object must be passed to the `EmailClientBuilder` via the `credential()` method. An endpoint must also be set via the `endpoint()` method.
diff --git a/sdk/communication/azure-communication-identity/README.md b/sdk/communication/azure-communication-identity/README.md
index 9fc198e11525..767f344ac834 100644
--- a/sdk/communication/azure-communication-identity/README.md
+++ b/sdk/communication/azure-communication-identity/README.md
@@ -63,7 +63,7 @@ add the direct dependency to your project as follows.
There are two forms of authentication to use the Identity SDK:
-### Azure Active Directory Token Authentication
+### Microsoft Entra ID Token Authentication
A `DefaultAzureCredential` object must be passed to the `CommunicationIdentityClientBuilder` via the credential() function. Endpoint and httpClient must also be set via the endpoint() and httpClient() functions respectively.
`AZURE_CLIENT_SECRET`, `AZURE_CLIENT_ID` and `AZURE_TENANT_ID` environment variables
diff --git a/sdk/communication/azure-communication-identity/src/main/java/com/azure/communication/identity/implementation/CommunicationIdentitiesImpl.java b/sdk/communication/azure-communication-identity/src/main/java/com/azure/communication/identity/implementation/CommunicationIdentitiesImpl.java
index 435653819b7f..b6f479054bf7 100644
--- a/sdk/communication/azure-communication-identity/src/main/java/com/azure/communication/identity/implementation/CommunicationIdentitiesImpl.java
+++ b/sdk/communication/azure-communication-identity/src/main/java/com/azure/communication/identity/implementation/CommunicationIdentitiesImpl.java
@@ -413,7 +413,7 @@ public void revokeAccessTokens(String id) {
}
/**
- * Exchange an Azure Active Directory (Azure AD) access token of a Teams user for a new Communication Identity
+ * Exchange an Microsoft Entra ID (Azure AD) access token of a Teams user for a new Communication Identity
* access token with a matching expiration time.
*
* @param body Request payload for the token exchange.
@@ -429,7 +429,7 @@ public void revokeAccessTokens(String id) {
}
/**
- * Exchange an Azure Active Directory (Azure AD) access token of a Teams user for a new Communication Identity
+ * Exchange an Microsoft Entra ID (Azure AD) access token of a Teams user for a new Communication Identity
* access token with a matching expiration time.
*
* @param body Request payload for the token exchange.
@@ -448,7 +448,7 @@ public void revokeAccessTokens(String id) {
}
/**
- * Exchange an Azure Active Directory (Azure AD) access token of a Teams user for a new Communication Identity
+ * Exchange an Microsoft Entra ID (Azure AD) access token of a Teams user for a new Communication Identity
* access token with a matching expiration time.
*
* @param body Request payload for the token exchange.
@@ -463,7 +463,7 @@ public Mono exchangeTeamsUserAccessTokenAsync(
}
/**
- * Exchange an Azure Active Directory (Azure AD) access token of a Teams user for a new Communication Identity
+ * Exchange an Microsoft Entra ID (Azure AD) access token of a Teams user for a new Communication Identity
* access token with a matching expiration time.
*
* @param body Request payload for the token exchange.
@@ -481,7 +481,7 @@ public Mono exchangeTeamsUserAccessTokenAsync(
}
/**
- * Exchange an Azure Active Directory (Azure AD) access token of a Teams user for a new Communication Identity
+ * Exchange an Microsoft Entra ID (Azure AD) access token of a Teams user for a new Communication Identity
* access token with a matching expiration time.
*
* @param body Request payload for the token exchange.
@@ -500,7 +500,7 @@ public Mono exchangeTeamsUserAccessTokenAsync(
}
/**
- * Exchange an Azure Active Directory (Azure AD) access token of a Teams user for a new Communication Identity
+ * Exchange an Microsoft Entra ID (Azure AD) access token of a Teams user for a new Communication Identity
* access token with a matching expiration time.
*
* @param body Request payload for the token exchange.
diff --git a/sdk/communication/azure-communication-messages/README.md b/sdk/communication/azure-communication-messages/README.md
index 9833d5f5e92d..1243c2fb8150 100644
--- a/sdk/communication/azure-communication-messages/README.md
+++ b/sdk/communication/azure-communication-messages/README.md
@@ -106,9 +106,9 @@ MessageTemplateClient messageTemplateClient = new MessageTemplateClientBuilder()
.buildClient();
```
-### Using `Azure Active Directory` managed identity
+### Using `Microsoft Entra ID` managed identity
-Client API key authentication is used in most of the examples, but you can also authenticate with Azure Active Directory using the [Azure Identity library][azure_identity]. To use the [DefaultAzureCredential][defaultazurecredential] provider shown below,
+Client API key authentication is used in most of the examples, but you can also authenticate with Microsoft Entra ID using the [Azure Identity library][azure_identity]. To use the [DefaultAzureCredential][defaultazurecredential] provider shown below,
The `AZURE_CLIENT_SECRET`, `AZURE_CLIENT_ID`, and `AZURE_TENANT_ID` environment variables are needed to create a `DefaultAzureCredential` object.
diff --git a/sdk/communication/azure-communication-phonenumbers/README.md b/sdk/communication/azure-communication-phonenumbers/README.md
index dfaa249bbe73..1b51582eb2e6 100644
--- a/sdk/communication/azure-communication-phonenumbers/README.md
+++ b/sdk/communication/azure-communication-phonenumbers/README.md
@@ -75,7 +75,7 @@ The configuration is managed using the `SipRoutingClient`, which provides method
### Initializing Client
-Clients can be initialized using the Azure Active Directory Authentication.
+Clients can be initialized using the Microsoft Entra ID Authentication.
```java readme-sample-createPhoneNumberClientWithAAD
// You can find your endpoint and access key from your resource in the Azure Portal
diff --git a/sdk/communication/azure-communication-rooms/README.md b/sdk/communication/azure-communication-rooms/README.md
index 32dafa27d6f1..5718250da2af 100644
--- a/sdk/communication/azure-communication-rooms/README.md
+++ b/sdk/communication/azure-communication-rooms/README.md
@@ -32,7 +32,7 @@ add the direct dependency to your project as follows.
## Authenticate the client
-### Azure Active Directory Token Authentication
+### Microsoft Entra ID Token Authentication
A `DefaultAzureCredential` object must be passed to the `RoomsClientBuilder` via the credential() function. Endpoint and httpClient must also be set via the endpoint() and httpClient() functions respectively.
`AZURE_CLIENT_SECRET`, `AZURE_CLIENT_ID` and `AZURE_TENANT_ID` environment variables
diff --git a/sdk/communication/azure-communication-sms/README.md b/sdk/communication/azure-communication-sms/README.md
index 902d6e5260de..9995c01eaf76 100644
--- a/sdk/communication/azure-communication-sms/README.md
+++ b/sdk/communication/azure-communication-sms/README.md
@@ -59,7 +59,7 @@ add the direct dependency to your project as follows.
## Authenticate the client
-### Azure Active Directory Token Authentication
+### Microsoft Entra ID Token Authentication
A `DefaultAzureCredential` object must be passed to the `SmsClientBuilder` via the credential() function. Endpoint and httpClient must also be set via the endpoint() and httpClient() functions respectively.
`AZURE_CLIENT_SECRET`, `AZURE_CLIENT_ID` and `AZURE_TENANT_ID` environment variables
diff --git a/sdk/compute/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/models/DataAccessAuthMode.java b/sdk/compute/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/models/DataAccessAuthMode.java
index 9d385697dcac..d93f9e87d8d1 100644
--- a/sdk/compute/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/models/DataAccessAuthMode.java
+++ b/sdk/compute/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/models/DataAccessAuthMode.java
@@ -12,7 +12,7 @@
*/
public final class DataAccessAuthMode extends ExpandableStringEnum {
/**
- * When export/upload URL is used, the system checks if the user has an identity in Azure Active Directory and has
+ * When export/upload URL is used, the system checks if the user has an identity in Microsoft Entra ID and has
* necessary permissions to export/upload the data. Please refer to aka.ms/DisksAzureADAuth.
*/
public static final DataAccessAuthMode AZURE_ACTIVE_DIRECTORY = fromString("AzureActiveDirectory");
diff --git a/sdk/compute/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/models/EncryptionSetIdentity.java b/sdk/compute/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/models/EncryptionSetIdentity.java
index d877f9b039e8..0c6544bdec15 100644
--- a/sdk/compute/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/models/EncryptionSetIdentity.java
+++ b/sdk/compute/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/models/EncryptionSetIdentity.java
@@ -54,7 +54,7 @@ public EncryptionSetIdentity() {
/**
* Get the type property: The type of Managed Identity used by the DiskEncryptionSet. Only SystemAssigned is
* supported for new creations. Disk Encryption Sets can be updated with Identity type None during migration of
- * subscription to a new Azure Active Directory tenant; it will cause the encrypted resources to lose access to the
+ * subscription to a new Microsoft Entra ID tenant; it will cause the encrypted resources to lose access to the
* keys.
*
* @return the type value.
@@ -66,7 +66,7 @@ public DiskEncryptionSetIdentityType type() {
/**
* Set the type property: The type of Managed Identity used by the DiskEncryptionSet. Only SystemAssigned is
* supported for new creations. Disk Encryption Sets can be updated with Identity type None during migration of
- * subscription to a new Azure Active Directory tenant; it will cause the encrypted resources to lose access to the
+ * subscription to a new Microsoft Entra ID tenant; it will cause the encrypted resources to lose access to the
* keys.
*
* @param type the type value to set.
diff --git a/sdk/confidentialledger/azure-security-confidentialledger/README.md b/sdk/confidentialledger/azure-security-confidentialledger/README.md
index 6f78a8b88da3..e0962d99db1e 100644
--- a/sdk/confidentialledger/azure-security-confidentialledger/README.md
+++ b/sdk/confidentialledger/azure-security-confidentialledger/README.md
@@ -28,19 +28,19 @@ portfolio, Azure Confidential Ledger runs in SGX enclaves. It is built on Micros
### Authenticate the client
-#### Using Azure Active Directory
+#### Using Microsoft Entra ID
-In order to interact with the Azure Confidential Ledger service, your client must present an Azure Active Directory bearer token to the service.
+In order to interact with the Azure Confidential Ledger service, your client must present a Microsoft Entra ID bearer token to the service.
The simplest way of providing a bearer token is to use the `DefaultAzureCredential` authentication method by providing client secret credentials is being used in this getting started section but you can find more ways to authenticate with [azure-identity][azure_identity].
#### Using a client certificate
-As an alternative to Azure Active Directory, clients may choose to use a client certificate to authenticate via mutual TLS. `CertificateCredential` may be used for this purpose. This is not the recommended approach for anyone new to the service.
+As an alternative to Microsoft Entra ID, clients may choose to use a client certificate to authenticate via mutual TLS. `CertificateCredential` may be used for this purpose. This is not the recommended approach for anyone new to the service.
-#### Create LedgerBaseClient with Azure Active Directory Credential
+#### Create LedgerBaseClient with Microsoft Entra ID Credential
-You can authenticate with Azure Active Directory using the [Azure Identity library][azure_identity].
+You can authenticate with Microsoft Entra ID using the [Azure Identity library][azure_identity].
After setup, you can choose which type of [credential][azure_identity_credential_type] from `azure-identity` to use.
We recommend using [DefaultAzureCredential][identity_dac], configured through the `AZURE_TOKEN_CREDENTIALS` environment variable.
@@ -136,4 +136,3 @@ This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For m
[azure_identity_credential_type]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/identity/azure-identity#credentials
[customize_defaultAzureCredential]: https://aka.ms/azsdk/java/identity/credential-chains#how-to-customize-defaultazurecredential
[identity_dac]: https://aka.ms/azsdk/java/identity/credential-chains#defaultazurecredential-overview
-
diff --git a/sdk/confidentialledger/azure-security-confidentialledger/src/samples/java/com/azure/security/confidentialledger/DeleteUserSample.java b/sdk/confidentialledger/azure-security-confidentialledger/src/samples/java/com/azure/security/confidentialledger/DeleteUserSample.java
index 4acf1e548dbd..ea4a3da1b1fd 100644
--- a/sdk/confidentialledger/azure-security-confidentialledger/src/samples/java/com/azure/security/confidentialledger/DeleteUserSample.java
+++ b/sdk/confidentialledger/azure-security-confidentialledger/src/samples/java/com/azure/security/confidentialledger/DeleteUserSample.java
@@ -16,7 +16,7 @@ public static void main(String[] args) {
.buildClient();
RequestOptions requestOptions = new RequestOptions();
- // you can retrieve your object id by going to Azure Active Directory and finding your profile
+ // you can retrieve your object id by going to Microsoft Entra ID and finding your profile
String aadObjectId = "";
Response response = confidentialLedgerClient.deleteUserWithResponse(aadObjectId, requestOptions);
}
diff --git a/sdk/containerregistry/azure-containers-containerregistry/README.md b/sdk/containerregistry/azure-containers-containerregistry/README.md
index c921a0a747c1..77034c43f2fd 100644
--- a/sdk/containerregistry/azure-containers-containerregistry/README.md
+++ b/sdk/containerregistry/azure-containers-containerregistry/README.md
@@ -63,7 +63,7 @@ and then include the direct dependency in the dependencies section without the v
### Authenticate clients
-The [Azure Identity library][identity] provides easy Azure Active Directory support for authentication.
+The [Azure Identity library][identity] provides easy Microsoft Entra ID support for authentication.
Note all the below samples assume you have an endpoint, which is the URL including the name of the login server and the `https://` prefix.
More information at [Azure Container Registry portal][container_registry_create_portal]
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ManagedClustersClient.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ManagedClustersClient.java
index 5da187c367cc..4dba19300ec2 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ManagedClustersClient.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ManagedClustersClient.java
@@ -985,7 +985,7 @@ void resetServicePrincipalProfile(String resourceGroupName, String resourceName,
/**
* Reset the AAD Profile of a managed cluster.
*
- * **WARNING**: This API will be deprecated. Please see [AKS-managed Azure Active Directory
+ * **WARNING**: This API will be deprecated. Please see [AKS-managed Microsoft Entra ID
* integration](https://aka.ms/aks-managed-aad) to update your cluster with AKS-managed Azure AD.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
@@ -1003,7 +1003,7 @@ Mono>> resetAADProfileWithResponseAsync(String resourc
/**
* Reset the AAD Profile of a managed cluster.
*
- * **WARNING**: This API will be deprecated. Please see [AKS-managed Azure Active Directory
+ * **WARNING**: This API will be deprecated. Please see [AKS-managed Microsoft Entra ID
* integration](https://aka.ms/aks-managed-aad) to update your cluster with AKS-managed Azure AD.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
@@ -1021,7 +1021,7 @@ PollerFlux, Void> beginResetAADProfileAsync(String resourceGrou
/**
* Reset the AAD Profile of a managed cluster.
*
- * **WARNING**: This API will be deprecated. Please see [AKS-managed Azure Active Directory
+ * **WARNING**: This API will be deprecated. Please see [AKS-managed Microsoft Entra ID
* integration](https://aka.ms/aks-managed-aad) to update your cluster with AKS-managed Azure AD.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
@@ -1039,7 +1039,7 @@ SyncPoller, Void> beginResetAADProfile(String resourceGroupName
/**
* Reset the AAD Profile of a managed cluster.
*
- * **WARNING**: This API will be deprecated. Please see [AKS-managed Azure Active Directory
+ * **WARNING**: This API will be deprecated. Please see [AKS-managed Microsoft Entra ID
* integration](https://aka.ms/aks-managed-aad) to update your cluster with AKS-managed Azure AD.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
@@ -1058,7 +1058,7 @@ SyncPoller, Void> beginResetAADProfile(String resourceGroupName
/**
* Reset the AAD Profile of a managed cluster.
*
- * **WARNING**: This API will be deprecated. Please see [AKS-managed Azure Active Directory
+ * **WARNING**: This API will be deprecated. Please see [AKS-managed Microsoft Entra ID
* integration](https://aka.ms/aks-managed-aad) to update your cluster with AKS-managed Azure AD.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
@@ -1075,7 +1075,7 @@ SyncPoller, Void> beginResetAADProfile(String resourceGroupName
/**
* Reset the AAD Profile of a managed cluster.
*
- * **WARNING**: This API will be deprecated. Please see [AKS-managed Azure Active Directory
+ * **WARNING**: This API will be deprecated. Please see [AKS-managed Microsoft Entra ID
* integration](https://aka.ms/aks-managed-aad) to update your cluster with AKS-managed Azure AD.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
@@ -1091,7 +1091,7 @@ SyncPoller, Void> beginResetAADProfile(String resourceGroupName
/**
* Reset the AAD Profile of a managed cluster.
*
- * **WARNING**: This API will be deprecated. Please see [AKS-managed Azure Active Directory
+ * **WARNING**: This API will be deprecated. Please see [AKS-managed Microsoft Entra ID
* integration](https://aka.ms/aks-managed-aad) to update your cluster with AKS-managed Azure AD.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterInner.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterInner.java
index dc19877ce898..81db225c25ef 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterInner.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterInner.java
@@ -805,7 +805,7 @@ public ManagedClusterInner withNetworkProfile(ContainerServiceNetworkProfile net
}
/**
- * Get the aadProfile property: The Azure Active Directory configuration.
+ * Get the aadProfile property: The Microsoft Entra ID configuration.
*
* @return the aadProfile value.
*/
@@ -814,7 +814,7 @@ public ManagedClusterAadProfile aadProfile() {
}
/**
- * Set the aadProfile property: The Azure Active Directory configuration.
+ * Set the aadProfile property: The Microsoft Entra ID configuration.
*
* @param aadProfile the aadProfile value to set.
* @return the ManagedClusterInner object itself.
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterProperties.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterProperties.java
index 55c4387f5e63..f8a2e5f1164a 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterProperties.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterProperties.java
@@ -201,7 +201,7 @@ public final class ManagedClusterProperties implements JsonSerializable>> resetAADProfileWithResponseAsync(String
/**
* Reset the AAD Profile of a managed cluster.
*
- * **WARNING**: This API will be deprecated. Please see [AKS-managed Azure Active Directory
+ * **WARNING**: This API will be deprecated. Please see [AKS-managed Microsoft Entra ID
* integration](https://aka.ms/aks-managed-aad) to update your cluster with AKS-managed Azure AD.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
@@ -2578,7 +2578,7 @@ private Mono>> resetAADProfileWithResponseAsync(String
/**
* Reset the AAD Profile of a managed cluster.
*
- * **WARNING**: This API will be deprecated. Please see [AKS-managed Azure Active Directory
+ * **WARNING**: This API will be deprecated. Please see [AKS-managed Microsoft Entra ID
* integration](https://aka.ms/aks-managed-aad) to update your cluster with AKS-managed Azure AD.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
@@ -2601,7 +2601,7 @@ public PollerFlux, Void> beginResetAADProfileAsync(String resou
/**
* Reset the AAD Profile of a managed cluster.
*
- * **WARNING**: This API will be deprecated. Please see [AKS-managed Azure Active Directory
+ * **WARNING**: This API will be deprecated. Please see [AKS-managed Microsoft Entra ID
* integration](https://aka.ms/aks-managed-aad) to update your cluster with AKS-managed Azure AD.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
@@ -2626,7 +2626,7 @@ private PollerFlux, Void> beginResetAADProfileAsync(String reso
/**
* Reset the AAD Profile of a managed cluster.
*
- * **WARNING**: This API will be deprecated. Please see [AKS-managed Azure Active Directory
+ * **WARNING**: This API will be deprecated. Please see [AKS-managed Microsoft Entra ID
* integration](https://aka.ms/aks-managed-aad) to update your cluster with AKS-managed Azure AD.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
@@ -2646,7 +2646,7 @@ public SyncPoller, Void> beginResetAADProfile(String resourceGr
/**
* Reset the AAD Profile of a managed cluster.
*
- * **WARNING**: This API will be deprecated. Please see [AKS-managed Azure Active Directory
+ * **WARNING**: This API will be deprecated. Please see [AKS-managed Microsoft Entra ID
* integration](https://aka.ms/aks-managed-aad) to update your cluster with AKS-managed Azure AD.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
@@ -2667,7 +2667,7 @@ public SyncPoller, Void> beginResetAADProfile(String resourceGr
/**
* Reset the AAD Profile of a managed cluster.
*
- * **WARNING**: This API will be deprecated. Please see [AKS-managed Azure Active Directory
+ * **WARNING**: This API will be deprecated. Please see [AKS-managed Microsoft Entra ID
* integration](https://aka.ms/aks-managed-aad) to update your cluster with AKS-managed Azure AD.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
@@ -2688,7 +2688,7 @@ public Mono resetAADProfileAsync(String resourceGroupName, String resource
/**
* Reset the AAD Profile of a managed cluster.
*
- * **WARNING**: This API will be deprecated. Please see [AKS-managed Azure Active Directory
+ * **WARNING**: This API will be deprecated. Please see [AKS-managed Microsoft Entra ID
* integration](https://aka.ms/aks-managed-aad) to update your cluster with AKS-managed Azure AD.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
@@ -2710,7 +2710,7 @@ private Mono resetAADProfileAsync(String resourceGroupName, String resourc
/**
* Reset the AAD Profile of a managed cluster.
*
- * **WARNING**: This API will be deprecated. Please see [AKS-managed Azure Active Directory
+ * **WARNING**: This API will be deprecated. Please see [AKS-managed Microsoft Entra ID
* integration](https://aka.ms/aks-managed-aad) to update your cluster with AKS-managed Azure AD.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
@@ -2728,7 +2728,7 @@ public void resetAADProfile(String resourceGroupName, String resourceName, Manag
/**
* Reset the AAD Profile of a managed cluster.
*
- * **WARNING**: This API will be deprecated. Please see [AKS-managed Azure Active Directory
+ * **WARNING**: This API will be deprecated. Please see [AKS-managed Microsoft Entra ID
* integration](https://aka.ms/aks-managed-aad) to update your cluster with AKS-managed Azure AD.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAadProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAadProfile.java
index 99cc3b29ce32..c259c2d80c9b 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAadProfile.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAadProfile.java
@@ -13,7 +13,7 @@
import java.util.List;
/**
- * AADProfile specifies attributes for Azure Active Directory integration. For more details see [managed AAD on
+ * AADProfile specifies attributes for Microsoft Entra ID integration. For more details see [managed AAD on
* AKS](https://docs.microsoft.com/azure/aks/managed-aad).
*/
@Fluent
diff --git a/sdk/contentsafety/azure-ai-contentsafety/README.md b/sdk/contentsafety/azure-ai-contentsafety/README.md
index bafa14263085..61a3cb0f1e16 100644
--- a/sdk/contentsafety/azure-ai-contentsafety/README.md
+++ b/sdk/contentsafety/azure-ai-contentsafety/README.md
@@ -62,7 +62,7 @@ BlocklistClient blocklistClient = new BlocklistClientBuilder()
.credential(new KeyCredential(key))
.endpoint(endpoint).buildClient();
```
-#### Create a ContentSafetyClient/BlocklistClient with Microsoft Entra ID (formerly Azure Active Directory (AAD)) token credential
+#### Create a ContentSafetyClient/BlocklistClient with Microsoft Entra ID token credential
- Step 1: Enable Microsoft Entra ID for your resource
Please refer to this Cognitive Services authentication document [Authenticate with Microsoft Entra ID.][authenticate_with_microsoft_entra_id] for the steps to enable AAD for your resource.
The main steps are:
@@ -325,4 +325,3 @@ For details on contributing to this repository, see the [contributing guide](htt
[authenticate_with_microsoft_entra_id]: https://learn.microsoft.com/azure/ai-services/authentication?tabs=powershell#authenticate-with-microsoft-entra-id
[text_severity_levels]: https://learn.microsoft.com/azure/ai-services/content-safety/concepts/harm-categories?tabs=definitions#text-content
[image_severity_levels]: https://learn.microsoft.com/azure/ai-services/content-safety/concepts/harm-categories?tabs=definitions#image-content
-
diff --git a/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/credentials/package-info.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/credentials/package-info.java
index e88a6decb81a..e10cd855f234 100644
--- a/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/credentials/package-info.java
+++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/credentials/package-info.java
@@ -11,7 +11,7 @@
*
*
* The library provides a unified way to obtain credentials for various Azure authentication
- * mechanisms, such as Azure Active Directory (AAD), shared access signatures, and API keys. It abstracts the
+ * mechanisms, such as Microsoft Entra ID (AAD), shared access signatures, and API keys. It abstracts the
* complexities of authentication and provides a consistent programming model for accessing Azure services.
*
*
@@ -26,15 +26,15 @@
* authentication mechanisms supported by the library:
*
*
- * - Azure Active Directory (AAD) Authentication
+ * - Microsoft Entra ID (AAD) Authentication
* - Shared Access Signature (SAS) Authentication
* - Key Based Authentication
*
*
- * Azure Active Directory (AAD) Authentication
+ * Microsoft Entra ID (AAD) Authentication
*
*
- * This type of authentication allows you to authenticate using Azure Active Directory and obtain a token to access
+ * This type of authentication allows you to authenticate using Microsoft Entra ID and obtain a token to access
* Azure resources. You can authenticate with AAD using client secrets, client certificates, or user credentials.
* The library offers {@link com.azure.v2.core.credentials.TokenCredential} interface which is accepted as an argument
* on the client builders in Azure SDKs where AAD authentication is supported.
diff --git a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/CbsAuthorizationType.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/CbsAuthorizationType.java
index b8f28c5056d1..a9044b080807 100644
--- a/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/CbsAuthorizationType.java
+++ b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/models/CbsAuthorizationType.java
@@ -31,7 +31,7 @@ public CbsAuthorizationType() {
/**
* Authorize with CBS using a JSON web token.
*
- * This is used in the case where Azure Active Directory is used for authentication and the authenticated user
+ * This is used in the case where Microsoft Entra ID is used for authentication and the authenticated user
* wants to authorize with Azure Event Hubs.
*/
public static final CbsAuthorizationType JSON_WEB_TOKEN = fromString("jwt", CbsAuthorizationType.class);
diff --git a/sdk/core/azure-core-management/src/main/java/com/azure/core/management/AzureEnvironment.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/AzureEnvironment.java
index d93b656d6fe6..b9d98c247682 100644
--- a/sdk/core/azure-core-management/src/main/java/com/azure/core/management/AzureEnvironment.java
+++ b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/AzureEnvironment.java
@@ -317,7 +317,7 @@ public enum Endpoint {
GALLERY("galleryEndpointUrl"),
/** Active Directory authentication endpoint. */
ACTIVE_DIRECTORY("activeDirectoryEndpointUrl"),
- /** Azure Active Directory Graph APIs endpoint. */
+ /** Microsoft Entra ID Graph APIs endpoint. */
GRAPH("activeDirectoryGraphResourceId"),
/** Key Vault DNS suffix. */
KEYVAULT("keyVaultDnsSuffix"),
diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/credential/AccessToken.java b/sdk/core/azure-core/src/main/java/com/azure/core/credential/AccessToken.java
index a386144c8a83..e464a0a83fcf 100644
--- a/sdk/core/azure-core/src/main/java/com/azure/core/credential/AccessToken.java
+++ b/sdk/core/azure-core/src/main/java/com/azure/core/credential/AccessToken.java
@@ -13,7 +13,7 @@
*
*
* An Access Token is a security token that is issued by an authentication source, such as
- * Azure Active Directory (AAD), and it represents the authorization to access a specific resource or service.
+ * Microsoft Entra ID (AAD), and it represents the authorization to access a specific resource or service.
* It is typically used to authenticate and authorize requests made to Azure services.
*
*
diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/credential/BasicAuthenticationCredential.java b/sdk/core/azure-core/src/main/java/com/azure/core/credential/BasicAuthenticationCredential.java
index b33213d0b8d4..666fea54c6c4 100644
--- a/sdk/core/azure-core/src/main/java/com/azure/core/credential/BasicAuthenticationCredential.java
+++ b/sdk/core/azure-core/src/main/java/com/azure/core/credential/BasicAuthenticationCredential.java
@@ -18,8 +18,8 @@
*
*
* Note that Basic Authentication is generally considered less secure than other authentication methods,
- * such as Azure Active Directory (AAD) authentication. It is recommended to use
- * Azure Active Directory (Azure AD)
+ * such as Microsoft Entra ID (AAD) authentication. It is recommended to use
+ * Microsoft Entra ID (Azure AD)
* authentication via {@link TokenCredential} whenever possible, especially for production environments.
*
*
diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/credential/SimpleTokenCache.java b/sdk/core/azure-core/src/main/java/com/azure/core/credential/SimpleTokenCache.java
index 9f09ee417399..fc386adf427e 100644
--- a/sdk/core/azure-core/src/main/java/com/azure/core/credential/SimpleTokenCache.java
+++ b/sdk/core/azure-core/src/main/java/com/azure/core/credential/SimpleTokenCache.java
@@ -25,7 +25,7 @@
* When using Azure services that require authentication, such as Azure Storage or Azure Key Vault, the library
* handles the acquisition and management of access tokens. By default, each request made to an Azure service triggers
* a token request, which involves authentication and token retrieval from the authentication provider
- * (e.g., Azure Active Directory).
+ * (e.g., Microsoft Entra ID).
*
*
*
diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/credential/TokenCredential.java b/sdk/core/azure-core/src/main/java/com/azure/core/credential/TokenCredential.java
index 649c1f1175b6..a2f94240dde1 100644
--- a/sdk/core/azure-core/src/main/java/com/azure/core/credential/TokenCredential.java
+++ b/sdk/core/azure-core/src/main/java/com/azure/core/credential/TokenCredential.java
@@ -8,7 +8,7 @@
/**
*
* Token Credential interface serves as a fundamental component for managing and providing access tokens required for
- * Azure Active Directory (Azure AD)
+ * Microsoft Entra ID (Azure AD)
* authentication when making requests to Azure services.
*
*
@@ -76,7 +76,7 @@
*
* These credential classes can be used in combination with various Azure client libraries to authenticate requests
* and access Azure services without the need to manage access tokens manually. The Token Credential interface provides
- * a consistent way to handle Azure Active Directory (AAD) authentication across different Azure services and SDKs in
+ * a consistent way to handle Microsoft Entra ID (AAD) authentication across different Azure services and SDKs in
* a secure and efficient manner.
*
*
diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/credential/TokenRequestContext.java b/sdk/core/azure-core/src/main/java/com/azure/core/credential/TokenRequestContext.java
index 1332961ea96f..8c475ae05ed5 100644
--- a/sdk/core/azure-core/src/main/java/com/azure/core/credential/TokenRequestContext.java
+++ b/sdk/core/azure-core/src/main/java/com/azure/core/credential/TokenRequestContext.java
@@ -18,7 +18,7 @@
*
* The {@link TokenRequestContext} is typically used with authentication mechanisms that require more advanced
* configurations or options, such as
- * Azure Active Directory (Azure AD)
+ * Microsoft Entra ID (Azure AD)
* authentication.
*
*
diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/credential/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/credential/package-info.java
index 3ee68f0e5ce6..10bfb698c17e 100644
--- a/sdk/core/azure-core/src/main/java/com/azure/core/credential/package-info.java
+++ b/sdk/core/azure-core/src/main/java/com/azure/core/credential/package-info.java
@@ -11,7 +11,7 @@
*
*
* The library provides a unified way to obtain credentials for various Azure authentication
- * mechanisms, such as Azure Active Directory (AAD), shared access signatures, and API keys. It abstracts the
+ * mechanisms, such as Microsoft Entra ID (AAD), shared access signatures, and API keys. It abstracts the
* complexities of authentication and provides a consistent programming model for accessing Azure services.
*
*
@@ -26,15 +26,15 @@
* authentication mechanisms supported by the library:
*
*
- * - Azure Active Directory (AAD) Authentication
+ * - Microsoft Entra ID (AAD) Authentication
* - Shared Access Signature (SAS) Authentication
* - Key Based Authentication
*
*
- * Azure Active Directory (AAD) Authentication
+ * Microsoft Entra ID (AAD) Authentication
*
*
- * This type of authentication allows you to authenticate using Azure Active Directory and obtain a token to access
+ * This type of authentication allows you to authenticate using Microsoft Entra ID and obtain a token to access
* Azure resources. You can authenticate with AAD using client secrets, client certificates, or user credentials.
* The library offers {@link com.azure.core.credential.TokenCredential} interface which is accepted as an argument
* on the client builders in Azure SDKs where AAD authentication is supported.
diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/util/Configuration.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/Configuration.java
index 8b2d627902d4..148b9e972ebc 100644
--- a/sdk/core/azure-core/src/main/java/com/azure/core/util/Configuration.java
+++ b/sdk/core/azure-core/src/main/java/com/azure/core/util/Configuration.java
@@ -48,12 +48,12 @@ public class Configuration implements Cloneable {
public static final String PROPERTY_HTTPS_PROXY = "HTTPS_PROXY";
/**
- * Endpoint to connect to when using Azure Active Directory managed service identity (MSI).
+ * Endpoint to connect to when using Microsoft Entra ID managed service identity (MSI).
*/
public static final String PROPERTY_IDENTITY_ENDPOINT = "IDENTITY_ENDPOINT";
/**
- * Header when connecting to Azure Active Directory using managed service identity (MSI).
+ * Header when connecting to Microsoft Entra ID using managed service identity (MSI).
*/
public static final String PROPERTY_IDENTITY_HEADER = "IDENTITY_HEADER";
@@ -63,12 +63,12 @@ public class Configuration implements Cloneable {
public static final String PROPERTY_NO_PROXY = "NO_PROXY";
/**
- * Endpoint to connect to when using Azure Active Directory managed service identity (MSI).
+ * Endpoint to connect to when using Microsoft Entra ID managed service identity (MSI).
*/
public static final String PROPERTY_MSI_ENDPOINT = "MSI_ENDPOINT";
/**
- * Secret when connecting to Azure Active Directory using managed service identity (MSI).
+ * Secret when connecting to Microsoft Entra ID using managed service identity (MSI).
*/
public static final String PROPERTY_MSI_SECRET = "MSI_SECRET";
@@ -143,7 +143,7 @@ public class Configuration implements Cloneable {
public static final String PROPERTY_AZURE_CLOUD = "AZURE_CLOUD";
/**
- * The Azure Active Directory endpoint to connect to.
+ * The Microsoft Entra ID endpoint to connect to.
*/
public static final String PROPERTY_AZURE_AUTHORITY_HOST = "AZURE_AUTHORITY_HOST";
diff --git a/sdk/cosmos/azure-cosmos-kafka-connect/src/main/java/com/azure/cosmos/kafka/connect/implementation/KafkaCosmosConfig.java b/sdk/cosmos/azure-cosmos-kafka-connect/src/main/java/com/azure/cosmos/kafka/connect/implementation/KafkaCosmosConfig.java
index f321932bb8d8..4b5eae18fd24 100644
--- a/sdk/cosmos/azure-cosmos-kafka-connect/src/main/java/com/azure/cosmos/kafka/connect/implementation/KafkaCosmosConfig.java
+++ b/sdk/cosmos/azure-cosmos-kafka-connect/src/main/java/com/azure/cosmos/kafka/connect/implementation/KafkaCosmosConfig.java
@@ -69,11 +69,11 @@ public class KafkaCosmosConfig extends AbstractConfig {
private static final String DEFAULT_AAD_CLIENT_SECRET = Strings.Emtpy;
private static final String AAD_AUTH_ENDPOINT_OVERRIDE = "azure.cosmos.auth.aad.authEndpointOverride";
- private static final String AAD_AUTH_ENDPOINT_OVERRIDE_DOC = "Overrides the Azure Active Directory (AAD) authentication endpoint. "
+ private static final String AAD_AUTH_ENDPOINT_OVERRIDE_DOC = "Overrides the Microsoft Entra ID (AAD) authentication endpoint. "
+ "This is useful when the Cosmos DB account resides in a non-public Azure cloud environment such as Azure Air-Gapped Environment. "
+ "By default, the SDK uses the standard AAD endpoint for the public Azure cloud. Set this value if your deployment requires a custom authority URI.";
private static final String AAD_AUTH_ENDPOINT_OVERRIDE_DISPLAY =
- "The Azure Active Directory (AAD) authentication endpoint override. Set this if you are using a cloud environment other than public Azure.";
+ "The Microsoft Entra ID (AAD) authentication endpoint override. Set this if you are using a cloud environment other than public Azure.";
private static final String DEFAULT_AAD_AUTH_ENDPOINT_OVERRIDE = Strings.Emtpy;
private static final String USE_GATEWAY_MODE = "azure.cosmos.mode.gateway";
diff --git a/sdk/cosmosdbforpostgresql/azure-resourcemanager-cosmosdbforpostgresql/src/samples/java/com/azure/resourcemanager/cosmosdbforpostgresql/generated/ClustersCreateSamples.java b/sdk/cosmosdbforpostgresql/azure-resourcemanager-cosmosdbforpostgresql/src/samples/java/com/azure/resourcemanager/cosmosdbforpostgresql/generated/ClustersCreateSamples.java
index 1c651a412704..c00fd9e3e196 100644
--- a/sdk/cosmosdbforpostgresql/azure-resourcemanager-cosmosdbforpostgresql/src/samples/java/com/azure/resourcemanager/cosmosdbforpostgresql/generated/ClustersCreateSamples.java
+++ b/sdk/cosmosdbforpostgresql/azure-resourcemanager-cosmosdbforpostgresql/src/samples/java/com/azure/resourcemanager/cosmosdbforpostgresql/generated/ClustersCreateSamples.java
@@ -254,7 +254,7 @@ public static void createANewClusterAsAPointInTimeRestore(
* x-ms-original-file: 2023-03-02-preview/ClusterCreateWithAAD.json
*/
/**
- * Sample code: Create a new cluster with Azure Active Directory Authentication.
+ * Sample code: Create a new cluster with Microsoft Entra ID Authentication.
*
* @param manager Entry point to CosmosDBForPostgreSqlManager.
*/
diff --git a/sdk/databasewatcher/azure-resourcemanager-databasewatcher/src/main/java/com/azure/resourcemanager/databasewatcher/models/TargetAuthenticationType.java b/sdk/databasewatcher/azure-resourcemanager-databasewatcher/src/main/java/com/azure/resourcemanager/databasewatcher/models/TargetAuthenticationType.java
index 60f7154502ae..577f1ea90a7e 100644
--- a/sdk/databasewatcher/azure-resourcemanager-databasewatcher/src/main/java/com/azure/resourcemanager/databasewatcher/models/TargetAuthenticationType.java
+++ b/sdk/databasewatcher/azure-resourcemanager-databasewatcher/src/main/java/com/azure/resourcemanager/databasewatcher/models/TargetAuthenticationType.java
@@ -12,7 +12,7 @@
*/
public final class TargetAuthenticationType extends ExpandableStringEnum {
/**
- * The Azure Active Directory authentication.
+ * The Microsoft Entra ID authentication.
*/
public static final TargetAuthenticationType AAD = fromString("Aad");
diff --git a/sdk/databoxedge/azure-resourcemanager-databoxedge/src/main/java/com/azure/resourcemanager/databoxedge/fluent/models/UploadCertificateResponseInner.java b/sdk/databoxedge/azure-resourcemanager-databoxedge/src/main/java/com/azure/resourcemanager/databoxedge/fluent/models/UploadCertificateResponseInner.java
index 7c4b4ff74163..91cab90d583e 100644
--- a/sdk/databoxedge/azure-resourcemanager-databoxedge/src/main/java/com/azure/resourcemanager/databoxedge/fluent/models/UploadCertificateResponseInner.java
+++ b/sdk/databoxedge/azure-resourcemanager-databoxedge/src/main/java/com/azure/resourcemanager/databoxedge/fluent/models/UploadCertificateResponseInner.java
@@ -28,22 +28,22 @@ public final class UploadCertificateResponseInner implements JsonSerializable {
/*
- * Application ID of the Azure Active Directory Application
+ * Application ID of the Microsoft Entra ID Application
*/
private String applicationId;
/*
- * Key used to authenticate to the Azure Active Directory Application
+ * Key used to authenticate to the Microsoft Entra ID Application
*/
private String appKey;
@@ -43,7 +43,7 @@ public AzureActiveDirectoryApp() {
}
/**
- * Get the applicationId property: Application ID of the Azure Active Directory Application.
+ * Get the applicationId property: Application ID of the Microsoft Entra ID Application.
*
* @return the applicationId value.
*/
@@ -52,7 +52,7 @@ public String applicationId() {
}
/**
- * Set the applicationId property: Application ID of the Azure Active Directory Application.
+ * Set the applicationId property: Application ID of the Microsoft Entra ID Application.
*
* @param applicationId the applicationId value to set.
* @return the AzureActiveDirectoryApp object itself.
@@ -63,7 +63,7 @@ public AzureActiveDirectoryApp withApplicationId(String applicationId) {
}
/**
- * Get the appKey property: Key used to authenticate to the Azure Active Directory Application.
+ * Get the appKey property: Key used to authenticate to the Microsoft Entra ID Application.
*
* @return the appKey value.
*/
@@ -72,7 +72,7 @@ public String appKey() {
}
/**
- * Set the appKey property: Key used to authenticate to the Azure Active Directory Application.
+ * Set the appKey property: Key used to authenticate to the Microsoft Entra ID Application.
*
* @param appKey the appKey value to set.
* @return the AzureActiveDirectoryApp object itself.
diff --git a/sdk/datamigration/azure-resourcemanager-datamigration/src/main/java/com/azure/resourcemanager/datamigration/models/ConnectToTargetSqlMISyncTaskInput.java b/sdk/datamigration/azure-resourcemanager-datamigration/src/main/java/com/azure/resourcemanager/datamigration/models/ConnectToTargetSqlMISyncTaskInput.java
index 0ebc81b92aa8..3372d40e9c72 100644
--- a/sdk/datamigration/azure-resourcemanager-datamigration/src/main/java/com/azure/resourcemanager/datamigration/models/ConnectToTargetSqlMISyncTaskInput.java
+++ b/sdk/datamigration/azure-resourcemanager-datamigration/src/main/java/com/azure/resourcemanager/datamigration/models/ConnectToTargetSqlMISyncTaskInput.java
@@ -23,7 +23,7 @@ public final class ConnectToTargetSqlMISyncTaskInput implements JsonSerializable
private MiSqlConnectionInfo targetConnectionInfo;
/*
- * Azure Active Directory Application the DMS (classic) instance will use to connect to the target instance of Azure
+ * Microsoft Entra ID Application the DMS (classic) instance will use to connect to the target instance of Azure
* SQL Database Managed Instance and the Azure Storage Account
*/
private AzureActiveDirectoryApp azureApp;
@@ -55,7 +55,7 @@ public ConnectToTargetSqlMISyncTaskInput withTargetConnectionInfo(MiSqlConnectio
}
/**
- * Get the azureApp property: Azure Active Directory Application the DMS (classic) instance will use to connect to
+ * Get the azureApp property: Microsoft Entra ID Application the DMS (classic) instance will use to connect to
* the target instance of Azure SQL Database Managed Instance and the Azure Storage Account.
*
* @return the azureApp value.
@@ -65,7 +65,7 @@ public AzureActiveDirectoryApp azureApp() {
}
/**
- * Set the azureApp property: Azure Active Directory Application the DMS (classic) instance will use to connect to
+ * Set the azureApp property: Microsoft Entra ID Application the DMS (classic) instance will use to connect to
* the target instance of Azure SQL Database Managed Instance and the Azure Storage Account.
*
* @param azureApp the azureApp value to set.
diff --git a/sdk/datamigration/azure-resourcemanager-datamigration/src/main/java/com/azure/resourcemanager/datamigration/models/MigrateSqlServerSqlMITaskInput.java b/sdk/datamigration/azure-resourcemanager-datamigration/src/main/java/com/azure/resourcemanager/datamigration/models/MigrateSqlServerSqlMITaskInput.java
index 0e19884b1433..1607a0f90a19 100644
--- a/sdk/datamigration/azure-resourcemanager-datamigration/src/main/java/com/azure/resourcemanager/datamigration/models/MigrateSqlServerSqlMITaskInput.java
+++ b/sdk/datamigration/azure-resourcemanager-datamigration/src/main/java/com/azure/resourcemanager/datamigration/models/MigrateSqlServerSqlMITaskInput.java
@@ -54,7 +54,7 @@ public final class MigrateSqlServerSqlMITaskInput extends SqlMigrationTaskInput
private BackupMode backupMode;
/*
- * Azure Active Directory domain name in the format of 'contoso.com' for federated Azure AD or
+ * Microsoft Entra ID domain name in the format of 'contoso.com' for federated Azure AD or
* 'contoso.onmicrosoft.com' for managed domain, required if and only if Windows logins are selected
*/
private String aadDomainName;
@@ -214,7 +214,7 @@ public MigrateSqlServerSqlMITaskInput withBackupMode(BackupMode backupMode) {
}
/**
- * Get the aadDomainName property: Azure Active Directory domain name in the format of 'contoso.com' for federated
+ * Get the aadDomainName property: Microsoft Entra ID domain name in the format of 'contoso.com' for federated
* Azure AD or 'contoso.onmicrosoft.com' for managed domain, required if and only if Windows logins are selected.
*
* @return the aadDomainName value.
@@ -224,7 +224,7 @@ public String aadDomainName() {
}
/**
- * Set the aadDomainName property: Azure Active Directory domain name in the format of 'contoso.com' for federated
+ * Set the aadDomainName property: Microsoft Entra ID domain name in the format of 'contoso.com' for federated
* Azure AD or 'contoso.onmicrosoft.com' for managed domain, required if and only if Windows logins are selected.
*
* @param aadDomainName the aadDomainName value to set.
diff --git a/sdk/datamigration/azure-resourcemanager-datamigration/src/main/java/com/azure/resourcemanager/datamigration/models/SqlServerSqlMISyncTaskInput.java b/sdk/datamigration/azure-resourcemanager-datamigration/src/main/java/com/azure/resourcemanager/datamigration/models/SqlServerSqlMISyncTaskInput.java
index 652df5d5be29..a5b9076ff5c4 100644
--- a/sdk/datamigration/azure-resourcemanager-datamigration/src/main/java/com/azure/resourcemanager/datamigration/models/SqlServerSqlMISyncTaskInput.java
+++ b/sdk/datamigration/azure-resourcemanager-datamigration/src/main/java/com/azure/resourcemanager/datamigration/models/SqlServerSqlMISyncTaskInput.java
@@ -44,7 +44,7 @@ public class SqlServerSqlMISyncTaskInput implements JsonSerializable --resource-group
```
-#### Azure Active Directory (AAD) Token authentication
-Azure Event Grid provides integration with Azure Active Directory (Azure AD) for identity-based authentication of requests.
+#### Microsoft Entra ID (AAD) Token authentication
+Azure Event Grid provides integration with Microsoft Entra ID (Azure AD) for identity-based authentication of requests.
With Azure AD, you can use role-based access control (RBAC) to grant access to your Azure Event Grid resources to users, groups, or applications.
To send events to a topic or domain with a `TokenCredential`, the authenticated identity should have the "EventGrid Data Sender" role assigned.
@@ -192,7 +192,7 @@ EventGridPublisherAsyncClient cloudEventAsyncClient = new EventGridP
.buildCloudEventPublisherAsyncClient();
```
-##### Using endpoint and Azure Active Directory (AAD) token credential to create the client
+##### Using endpoint and Microsoft Entra ID (AAD) token credential to create the client
To use the AAD token credential, include `azure-identity` artifact as a dependency. Refer to
[azure-identity README](https://learn.microsoft.com/java/api/overview/azure/identity-readme) for details.
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/README.md b/sdk/eventhubs/azure-messaging-eventhubs/README.md
index 8541cefe0894..8434b8c48ff9 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/README.md
+++ b/sdk/eventhubs/azure-messaging-eventhubs/README.md
@@ -28,7 +28,7 @@ documentation][event_hubs_product_docs] | [Samples][sample_examples] | [Troubles
- [Include direct dependency](#include-direct-dependency)
- [Authenticate the client](#authenticate-the-client)
- [Create an Event Hub producer using a connection string](#create-an-event-hub-producer-using-a-connection-string)
- - [Create an Event Hub client using Microsoft identity platform (formerly Azure Active Directory)](#create-an-event-hub-client-using-microsoft-identity-platform-formerly-azure-active-directory)
+ - [Create an Event Hub client using Microsoft identity platform](#create-an-event-hub-client-using-microsoft-identity-platform)
- [Authorizing with DefaultAzureCredential](#authorizing-with-defaultazurecredential)
- [Key concepts](#key-concepts)
- [Examples](#examples)
@@ -126,7 +126,7 @@ EventHubProducerClient producer = new EventHubClientBuilder()
.buildProducerClient();
```
-#### Create an Event Hub client using Microsoft identity platform (formerly Azure Active Directory)
+#### Create an Event Hub client using Microsoft identity platform
Azure SDK for Java supports an Azure Identity package, making it easy to get credentials from Microsoft identity
platform. First, add the package:
@@ -142,13 +142,13 @@ platform. First, add the package:
[//]: # ({x-version-update-end})
All the implemented ways to request a credential can be found under the `com.azure.identity.credential` package. The
-sample below shows how to use an Azure Active Directory (AAD) application client secret to authorize with Azure Event
+sample below shows how to use an Microsoft Entra ID (AAD) application client secret to authorize with Azure Event
Hubs.
#### Authorizing with DefaultAzureCredential
Authorization is easiest using [DefaultAzureCredential][wiki_identity]. It finds the best credential to use in its
-running environment. For more information about using Azure Active Directory authorization with Event Hubs, please refer
+running environment. For more information about using Microsoft Entra ID authorization with Event Hubs, please refer
to [the associated documentation][aad_authorization].
```java com.azure.messaging.eventhubs.eventhubproducerclient.construct
@@ -466,4 +466,3 @@ Guidelines](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/eventhubs/
[wiki_identity]: https://learn.microsoft.com/azure/developer/java/sdk/identity
[troubleshooting]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/eventhubs/azure-messaging-eventhubs/TROUBLESHOOTING.md
-
diff --git a/sdk/eventhubs/azure-resourcemanager-eventhubs/src/main/java/com/azure/resourcemanager/eventhubs/models/CaptureIdentity.java b/sdk/eventhubs/azure-resourcemanager-eventhubs/src/main/java/com/azure/resourcemanager/eventhubs/models/CaptureIdentity.java
index 3ffaa55c6dc1..2c2362488ca7 100644
--- a/sdk/eventhubs/azure-resourcemanager-eventhubs/src/main/java/com/azure/resourcemanager/eventhubs/models/CaptureIdentity.java
+++ b/sdk/eventhubs/azure-resourcemanager-eventhubs/src/main/java/com/azure/resourcemanager/eventhubs/models/CaptureIdentity.java
@@ -17,7 +17,7 @@
@Fluent
public final class CaptureIdentity implements JsonSerializable {
/*
- * Type of Azure Active Directory Managed Identity.
+ * Type of Microsoft Entra ID Managed Identity.
*/
private CaptureIdentityType type;
@@ -34,7 +34,7 @@ public CaptureIdentity() {
}
/**
- * Get the type property: Type of Azure Active Directory Managed Identity.
+ * Get the type property: Type of Microsoft Entra ID Managed Identity.
*
* @return the type value.
*/
@@ -43,7 +43,7 @@ public CaptureIdentityType type() {
}
/**
- * Set the type property: Type of Azure Active Directory Managed Identity.
+ * Set the type property: Type of Microsoft Entra ID Managed Identity.
*
* @param type the type value to set.
* @return the CaptureIdentity object itself.
diff --git a/sdk/eventhubs/azure-resourcemanager-eventhubs/src/main/java/com/azure/resourcemanager/eventhubs/models/CaptureIdentityType.java b/sdk/eventhubs/azure-resourcemanager-eventhubs/src/main/java/com/azure/resourcemanager/eventhubs/models/CaptureIdentityType.java
index 5ca89f65213d..5d0f4bd93bc7 100644
--- a/sdk/eventhubs/azure-resourcemanager-eventhubs/src/main/java/com/azure/resourcemanager/eventhubs/models/CaptureIdentityType.java
+++ b/sdk/eventhubs/azure-resourcemanager-eventhubs/src/main/java/com/azure/resourcemanager/eventhubs/models/CaptureIdentityType.java
@@ -5,7 +5,7 @@
package com.azure.resourcemanager.eventhubs.models;
/**
- * Type of Azure Active Directory Managed Identity.
+ * Type of Microsoft Entra ID Managed Identity.
*/
public enum CaptureIdentityType {
/**
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/README.md b/sdk/formrecognizer/azure-ai-formrecognizer/README.md
index 602ae8309dee..3a4c10eb3101 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/README.md
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/README.md
@@ -156,7 +156,7 @@ DocumentModelAdministrationClient client =
.buildClient();
```
-#### Create a Document Analysis client with Azure Active Directory credential
+#### Create a Document Analysis client with Microsoft Entra ID credential
Azure SDK for Java supports an Azure Identity package, making it easy to get credentials from Microsoft identity
platform.
@@ -172,7 +172,7 @@ Authentication with AAD requires some initial setup:
```
[//]: # ({x-version-update-end})
-* [Register a new Azure Active Directory application][register_AAD_application]
+* [Register a new Microsoft Entra ID application][register_AAD_application]
* [Grant access][grant_access] to Form Recognizer by assigning the `"Cognitive Services User"` role to your service principal.
After setup, you can choose which type of [credential][azure_identity_credential_type] from `azure-identity` to use.
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/Authentication.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/Authentication.java
index 48377c10c148..702369524cfd 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/Authentication.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/Authentication.java
@@ -25,7 +25,7 @@
/**
* Samples for two supported methods of authentication in Document Analysis and Document Model Administration clients:
* 1) Use a Form Recognizer API key with AzureKeyCredential from azure.core.credentials
- * 2) Use a token credential from azure-identity to authenticate with Azure Active Directory
+ * 2) Use a token credential from azure-identity to authenticate with Microsoft Entra ID
*/
public class Authentication {
/**
@@ -43,13 +43,13 @@ public static void main(String[] args) {
// Document Analysis client: Key credential
authenticationWithKeyCredentialDocumentAnalysisClient();
- // Document Analysis client: Azure Active Directory
+ // Document Analysis client: Microsoft Entra ID
authenticationWithAzureActiveDirectoryDocumentAnalysisClient();
- // Document Analysis client: Azure Active Directory : China Cloud
+ // Document Analysis client: Microsoft Entra ID : China Cloud
authenticationWithAzureActiveDirectoryChinaCloud();
// Document Model Administration client: Key credential
authenticationWithKeyCredentialDocumentModelAdministrationClient();
- // Document Model Administration client: Azure Active Directory
+ // Document Model Administration client: Microsoft Entra ID
authenticationWithAzureActiveDirectoryDocumentModelAdministrationClient();
}
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/v3/Authentication.java b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/v3/Authentication.java
index 813dc0789bfd..06fa92e694cc 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/v3/Authentication.java
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/java/com/azure/ai/formrecognizer/v3/Authentication.java
@@ -23,7 +23,7 @@
/**
* Samples for two supported methods of authentication in Form Recognizer and Form Training clients:
* 1) Use a Form Recognizer API key with AzureKeyCredential from azure.core.credentials
- * 2) Use a token credential from azure-identity to authenticate with Azure Active Directory
+ * 2) Use a token credential from azure-identity to authenticate with Microsoft Entra ID
*/
public class Authentication {
/**
@@ -42,11 +42,11 @@ public static void main(String[] args) {
// Form recognizer client: Key credential
authenticationWithKeyCredentialFormRecognizerClient();
- // Form recognizer client: Azure Active Directory
+ // Form recognizer client: Microsoft Entra ID
authenticationWithAzureActiveDirectoryFormRecognizerClient();
// Form training client: Key credential
authenticationWithKeyCredentialFormTrainingClient();
- // Form training client: Azure Active Directory
+ // Form training client: Microsoft Entra ID
authenticationWithAzureActiveDirectoryFormTrainingClient();
}
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/SecurityProfile.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/SecurityProfile.java
index 35a32362c2ba..0a61f2aa6f15 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/SecurityProfile.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/SecurityProfile.java
@@ -53,7 +53,7 @@ public final class SecurityProfile implements JsonSerializable
private List clusterUsersGroupDNs;
/*
- * The resource ID of the user's Azure Active Directory Domain Service.
+ * The resource ID of the user's Microsoft Entra ID Domain Service.
*/
private String aaddsResourceId;
@@ -211,7 +211,7 @@ public SecurityProfile withClusterUsersGroupDNs(List clusterUsersGroupDN
}
/**
- * Get the aaddsResourceId property: The resource ID of the user's Azure Active Directory Domain Service.
+ * Get the aaddsResourceId property: The resource ID of the user's Microsoft Entra ID Domain Service.
*
* @return the aaddsResourceId value.
*/
@@ -220,7 +220,7 @@ public String aaddsResourceId() {
}
/**
- * Set the aaddsResourceId property: The resource ID of the user's Azure Active Directory Domain Service.
+ * Set the aaddsResourceId property: The resource ID of the user's Microsoft Entra ID Domain Service.
*
* @param aaddsResourceId the aaddsResourceId value to set.
* @return the SecurityProfile object itself.
diff --git a/sdk/hybridkubernetes/azure-resourcemanager-hybridkubernetes/src/main/java/com/azure/resourcemanager/hybridkubernetes/models/AadProfile.java b/sdk/hybridkubernetes/azure-resourcemanager-hybridkubernetes/src/main/java/com/azure/resourcemanager/hybridkubernetes/models/AadProfile.java
index 13d9b6d44be6..f33bb9a4f5e9 100644
--- a/sdk/hybridkubernetes/azure-resourcemanager-hybridkubernetes/src/main/java/com/azure/resourcemanager/hybridkubernetes/models/AadProfile.java
+++ b/sdk/hybridkubernetes/azure-resourcemanager-hybridkubernetes/src/main/java/com/azure/resourcemanager/hybridkubernetes/models/AadProfile.java
@@ -13,7 +13,7 @@
import java.util.List;
/**
- * AAD Profile specifies attributes for Azure Active Directory integration.
+ * AAD Profile specifies attributes for Microsoft Entra ID integration.
*/
@Fluent
public final class AadProfile implements JsonSerializable {
diff --git a/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/AccessPolicy.java b/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/AccessPolicy.java
index cc16ca40f748..631de5920c65 100644
--- a/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/AccessPolicy.java
+++ b/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/AccessPolicy.java
@@ -17,16 +17,16 @@
@Fluent
public interface AccessPolicy extends ChildResource, HasInnerModel {
/**
- * Gets the Azure Active Directory tenant ID that should be used for authenticating requests to the key vault.
+ * Gets the Microsoft Entra ID tenant ID that should be used for authenticating requests to the key vault.
*
- * @return The Azure Active Directory tenant ID that should be used for authenticating requests to the key vault.
+ * @return The Microsoft Entra ID tenant ID that should be used for authenticating requests to the key vault.
*/
String tenantId();
/**
- * Gets the object ID of a user or service principal in the Azure Active Directory tenant for the vault.
+ * Gets the object ID of a user or service principal in the Microsoft Entra ID tenant for the vault.
*
- * @return The object ID of a user or service principal in the Azure Active Directory tenant for the vault.
+ * @return The object ID of a user or service principal in the Microsoft Entra ID tenant for the vault.
*/
String objectId();
@@ -105,7 +105,7 @@ interface WithIdentity {
WithAttach forApplicationId(String applicationId);
/**
- * Specifies the Azure Active Directory tenant ID that should be used for authenticating requests to the key
+ * Specifies the Microsoft Entra ID tenant ID that should be used for authenticating requests to the key
* vault.
*
* @param tenantId the tenant ID for the key vault.
@@ -307,7 +307,7 @@ interface WithIdentity {
WithAttach forApplicationId(String applicationId);
/**
- * Specifies the Azure Active Directory tenant ID that should be used for authenticating requests to the key
+ * Specifies the Microsoft Entra ID tenant ID that should be used for authenticating requests to the key
* vault.
*
* @param tenantId the tenant ID for the key vault.
diff --git a/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/AccessPolicyEntry.java b/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/AccessPolicyEntry.java
index 1d1d0d106b7f..845aa10c6e59 100644
--- a/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/AccessPolicyEntry.java
+++ b/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/AccessPolicyEntry.java
@@ -21,12 +21,12 @@
@Fluent
public final class AccessPolicyEntry implements JsonSerializable {
/*
- * The Azure Active Directory tenant ID that should be used for authenticating requests to the key vault.
+ * The Microsoft Entra ID tenant ID that should be used for authenticating requests to the key vault.
*/
private UUID tenantId;
/*
- * The object ID of a user, service principal or security group in the Azure Active Directory tenant for the vault.
+ * The object ID of a user, service principal or security group in the Microsoft Entra ID tenant for the vault.
* The object ID must be unique for the list of access policies.
*/
private String objectId;
@@ -48,7 +48,7 @@ public AccessPolicyEntry() {
}
/**
- * Get the tenantId property: The Azure Active Directory tenant ID that should be used for authenticating requests
+ * Get the tenantId property: The Microsoft Entra ID tenant ID that should be used for authenticating requests
* to the key vault.
*
* @return the tenantId value.
@@ -58,7 +58,7 @@ public UUID tenantId() {
}
/**
- * Set the tenantId property: The Azure Active Directory tenant ID that should be used for authenticating requests
+ * Set the tenantId property: The Microsoft Entra ID tenant ID that should be used for authenticating requests
* to the key vault.
*
* @param tenantId the tenantId value to set.
diff --git a/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/ManagedHsmProperties.java b/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/ManagedHsmProperties.java
index 08213eaaaa84..9546e541dfd9 100644
--- a/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/ManagedHsmProperties.java
+++ b/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/ManagedHsmProperties.java
@@ -23,7 +23,7 @@
@Fluent
public final class ManagedHsmProperties implements JsonSerializable {
/*
- * The Azure Active Directory tenant ID that should be used for authenticating requests to the managed HSM pool.
+ * The Microsoft Entra ID tenant ID that should be used for authenticating requests to the managed HSM pool.
*/
private UUID tenantId;
@@ -108,7 +108,7 @@ public ManagedHsmProperties() {
}
/**
- * Get the tenantId property: The Azure Active Directory tenant ID that should be used for authenticating requests
+ * Get the tenantId property: The Microsoft Entra ID tenant ID that should be used for authenticating requests
* to the managed HSM pool.
*
* @return the tenantId value.
@@ -118,7 +118,7 @@ public UUID tenantId() {
}
/**
- * Set the tenantId property: The Azure Active Directory tenant ID that should be used for authenticating requests
+ * Set the tenantId property: The Microsoft Entra ID tenant ID that should be used for authenticating requests
* to the managed HSM pool.
*
* @param tenantId the tenantId value to set.
diff --git a/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/Vault.java b/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/Vault.java
index 1e2d2860f65a..78c90d92c96b 100644
--- a/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/Vault.java
+++ b/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/Vault.java
@@ -66,9 +66,9 @@ public interface Vault extends GroupableResource, R
String vaultUri();
/**
- * Gets the Azure Active Directory tenant ID that should be used for authenticating requests to the key vault.
+ * Gets the Microsoft Entra ID tenant ID that should be used for authenticating requests to the key vault.
*
- * @return the Azure Active Directory tenant ID that should be used for authenticating requests to the key vault.
+ * @return the Microsoft Entra ID tenant ID that should be used for authenticating requests to the key vault.
*/
String tenantId();
diff --git a/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/VaultPatchProperties.java b/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/VaultPatchProperties.java
index df62b1169095..8f13fe9c6b10 100644
--- a/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/VaultPatchProperties.java
+++ b/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/VaultPatchProperties.java
@@ -20,7 +20,7 @@
@Fluent
public final class VaultPatchProperties implements JsonSerializable {
/*
- * The Azure Active Directory tenant ID that should be used for authenticating requests to the key vault.
+ * The Microsoft Entra ID tenant ID that should be used for authenticating requests to the key vault.
*/
private UUID tenantId;
@@ -104,7 +104,7 @@ public VaultPatchProperties() {
}
/**
- * Get the tenantId property: The Azure Active Directory tenant ID that should be used for authenticating requests
+ * Get the tenantId property: The Microsoft Entra ID tenant ID that should be used for authenticating requests
* to the key vault.
*
* @return the tenantId value.
@@ -114,7 +114,7 @@ public UUID tenantId() {
}
/**
- * Set the tenantId property: The Azure Active Directory tenant ID that should be used for authenticating requests
+ * Set the tenantId property: The Microsoft Entra ID tenant ID that should be used for authenticating requests
* to the key vault.
*
* @param tenantId the tenantId value to set.
diff --git a/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/VaultProperties.java b/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/VaultProperties.java
index 41c8d0676c86..d8d31043c7a4 100644
--- a/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/VaultProperties.java
+++ b/sdk/keyvault/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/models/VaultProperties.java
@@ -21,7 +21,7 @@
@Fluent
public final class VaultProperties implements JsonSerializable {
/*
- * The Azure Active Directory tenant ID that should be used for authenticating requests to the key vault.
+ * The Microsoft Entra ID tenant ID that should be used for authenticating requests to the key vault.
*/
private UUID tenantId;
@@ -127,7 +127,7 @@ public VaultProperties() {
}
/**
- * Get the tenantId property: The Azure Active Directory tenant ID that should be used for authenticating requests
+ * Get the tenantId property: The Microsoft Entra ID tenant ID that should be used for authenticating requests
* to the key vault.
*
* @return the tenantId value.
@@ -137,7 +137,7 @@ public UUID tenantId() {
}
/**
- * Set the tenantId property: The Azure Active Directory tenant ID that should be used for authenticating requests
+ * Set the tenantId property: The Microsoft Entra ID tenant ID that should be used for authenticating requests
* to the key vault.
*
* @param tenantId the tenantId value to set.
diff --git a/sdk/keyvault/azure-resourcemanager-keyvault/src/test/java/com/azure/resourcemanager/keyvault/ManagedHsmTests.java b/sdk/keyvault/azure-resourcemanager-keyvault/src/test/java/com/azure/resourcemanager/keyvault/ManagedHsmTests.java
index 111fd731b7ad..aea3e656b648 100644
--- a/sdk/keyvault/azure-resourcemanager-keyvault/src/test/java/com/azure/resourcemanager/keyvault/ManagedHsmTests.java
+++ b/sdk/keyvault/azure-resourcemanager-keyvault/src/test/java/com/azure/resourcemanager/keyvault/ManagedHsmTests.java
@@ -59,7 +59,7 @@ public void canCrudManagedHsms() {
ManagedHsm hsm = keyVaultManager.managedHsms().getByResourceGroup(rgName, managedHsm.name());
// ManagedHsm properties
- // The Azure Active Directory tenant ID that should be used for authenticating requests to the managed HSM pool.
+ // The Microsoft Entra ID tenant ID that should be used for authenticating requests to the managed HSM pool.
String tenantId = hsm.tenantId();
Assertions.assertNotNull(tenantId);
diff --git a/sdk/kusto/azure-resourcemanager-kusto/src/main/java/com/azure/resourcemanager/kusto/fluent/models/OutboundNetworkDependenciesEndpointInner.java b/sdk/kusto/azure-resourcemanager-kusto/src/main/java/com/azure/resourcemanager/kusto/fluent/models/OutboundNetworkDependenciesEndpointInner.java
index 24cdd50367eb..dc3d782ac630 100644
--- a/sdk/kusto/azure-resourcemanager-kusto/src/main/java/com/azure/resourcemanager/kusto/fluent/models/OutboundNetworkDependenciesEndpointInner.java
+++ b/sdk/kusto/azure-resourcemanager-kusto/src/main/java/com/azure/resourcemanager/kusto/fluent/models/OutboundNetworkDependenciesEndpointInner.java
@@ -100,7 +100,7 @@ public String id() {
/**
* Get the category property: The type of service accessed by the Kusto Service Environment, e.g., Azure Storage,
- * Azure SQL Database, and Azure Active Directory.
+ * Azure SQL Database, and Microsoft Entra ID.
*
* @return the category value.
*/
@@ -110,7 +110,7 @@ public String category() {
/**
* Set the category property: The type of service accessed by the Kusto Service Environment, e.g., Azure Storage,
- * Azure SQL Database, and Azure Active Directory.
+ * Azure SQL Database, and Microsoft Entra ID.
*
* @param category the category value to set.
* @return the OutboundNetworkDependenciesEndpointInner object itself.
diff --git a/sdk/kusto/azure-resourcemanager-kusto/src/main/java/com/azure/resourcemanager/kusto/fluent/models/OutboundNetworkDependenciesEndpointProperties.java b/sdk/kusto/azure-resourcemanager-kusto/src/main/java/com/azure/resourcemanager/kusto/fluent/models/OutboundNetworkDependenciesEndpointProperties.java
index d0824ab9fc4d..93edd9e4e983 100644
--- a/sdk/kusto/azure-resourcemanager-kusto/src/main/java/com/azure/resourcemanager/kusto/fluent/models/OutboundNetworkDependenciesEndpointProperties.java
+++ b/sdk/kusto/azure-resourcemanager-kusto/src/main/java/com/azure/resourcemanager/kusto/fluent/models/OutboundNetworkDependenciesEndpointProperties.java
@@ -44,7 +44,7 @@ public OutboundNetworkDependenciesEndpointProperties() {
/**
* Get the category property: The type of service accessed by the Kusto Service Environment, e.g., Azure Storage,
- * Azure SQL Database, and Azure Active Directory.
+ * Azure SQL Database, and Microsoft Entra ID.
*
* @return the category value.
*/
@@ -54,7 +54,7 @@ public String category() {
/**
* Set the category property: The type of service accessed by the Kusto Service Environment, e.g., Azure Storage,
- * Azure SQL Database, and Azure Active Directory.
+ * Azure SQL Database, and Microsoft Entra ID.
*
* @param category the category value to set.
* @return the OutboundNetworkDependenciesEndpointProperties object itself.
diff --git a/sdk/kusto/azure-resourcemanager-kusto/src/main/java/com/azure/resourcemanager/kusto/models/OutboundNetworkDependenciesEndpoint.java b/sdk/kusto/azure-resourcemanager-kusto/src/main/java/com/azure/resourcemanager/kusto/models/OutboundNetworkDependenciesEndpoint.java
index 24c763209d23..e68f7eeea719 100644
--- a/sdk/kusto/azure-resourcemanager-kusto/src/main/java/com/azure/resourcemanager/kusto/models/OutboundNetworkDependenciesEndpoint.java
+++ b/sdk/kusto/azure-resourcemanager-kusto/src/main/java/com/azure/resourcemanager/kusto/models/OutboundNetworkDependenciesEndpoint.java
@@ -41,7 +41,7 @@ public interface OutboundNetworkDependenciesEndpoint {
/**
* Gets the category property: The type of service accessed by the Kusto Service Environment, e.g., Azure Storage,
- * Azure SQL Database, and Azure Active Directory.
+ * Azure SQL Database, and Microsoft Entra ID.
*
* @return the category value.
*/
diff --git a/sdk/loadtesting/azure-developer-loadtesting/README.md b/sdk/loadtesting/azure-developer-loadtesting/README.md
index 3c8543f9fc60..6e7e598d45a1 100644
--- a/sdk/loadtesting/azure-developer-loadtesting/README.md
+++ b/sdk/loadtesting/azure-developer-loadtesting/README.md
@@ -36,7 +36,7 @@ Various documentation is available to help you get started
[Azure Identity][azure_identity] package provides the default implementation for authenticating the client.
-By default, Azure Active Directory token authentication depends on correct configure of following environment variables.
+By default, Microsoft Entra ID token authentication depends on correct configure of following environment variables.
- `AZURE_CLIENT_ID` for Azure client ID.
- `AZURE_TENANT_ID` for Azure tenant ID.
diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComputeInstanceCreatedBy.java b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComputeInstanceCreatedBy.java
index 0af4b6db865d..206a841be666 100644
--- a/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComputeInstanceCreatedBy.java
+++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/src/main/java/com/azure/resourcemanager/machinelearning/models/ComputeInstanceCreatedBy.java
@@ -22,7 +22,7 @@ public final class ComputeInstanceCreatedBy implements JsonSerializable
```
[//]: # ({x-version-update-end})
-* [Register a new Azure Active Directory application][register_AAD_application]
+* [Register a new Microsoft Entra ID application][register_AAD_application]
* [Grant access][grant_access] to Metrics Advisor by assigning the `"Cognitive Services User"` role to your service principal.
After setup, you can choose which type of [credential][azure_identity_credential_type] from `azure-identity` to use.
diff --git a/sdk/monitor/azure-monitor-ingestion/README.md b/sdk/monitor/azure-monitor-ingestion/README.md
index 2a8a2dfefef2..126ed449b18e 100644
--- a/sdk/monitor/azure-monitor-ingestion/README.md
+++ b/sdk/monitor/azure-monitor-ingestion/README.md
@@ -68,8 +68,8 @@ add the direct dependency to your project as follows.
An authenticated client is required to upload logs to Azure Monitor. The library includes both synchronous and asynchronous forms of the clients. To authenticate,
the following examples use `DefaultAzureCredentialBuilder` from the [azure-identity](https://central.sonatype.com/artifact/com.azure/azure-identity/1.8.1) package.
-#### Authenticating using Azure Active Directory
-You can authenticate with Azure Active Directory using the [Azure Identity library][azure_identity].
+#### Authenticating using Microsoft Entra ID
+You can authenticate with Microsoft Entra ID using the [Azure Identity library][azure_identity].
After setup, you can choose which type of [credential][azure_identity_credential_type] from `azure-identity` to use.
We recommend using [DefaultAzureCredential][identity_dac], configured through the `AZURE_TOKEN_CREDENTIALS` environment variable.
diff --git a/sdk/monitor/azure-monitor-ingestion/TROUBLESHOOTING.md b/sdk/monitor/azure-monitor-ingestion/TROUBLESHOOTING.md
index c9591b2ee5c7..3d045ce65bec 100644
--- a/sdk/monitor/azure-monitor-ingestion/TROUBLESHOOTING.md
+++ b/sdk/monitor/azure-monitor-ingestion/TROUBLESHOOTING.md
@@ -60,7 +60,7 @@ clientBuilder.httpLogOptions(new HttpLogOptions().addAllowedHeaderName("safe-to-
### Authentication errors
-The Azure Monitor Ingestion library supports Azure Active Directory authentication. The `LogsIngestionClientBuilder` can be configured to set the `credential`. To provide a valid credential, you can use `azure-identity` dependency. For more information on getting started, see the [README](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/monitor/azure-monitor-ingestion#create-the-client) of the Azure Monitor Ingestion library. For more information on the credential types supported in `azure-identity`, see the [Azure Identity library documentation](https://learn.microsoft.com/azure/developer/java/sdk/identity).
+The Azure Monitor Ingestion library supports Microsoft Entra ID authentication. The `LogsIngestionClientBuilder` can be configured to set the `credential`. To provide a valid credential, you can use `azure-identity` dependency. For more information on getting started, see the [README](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/monitor/azure-monitor-ingestion#create-the-client) of the Azure Monitor Ingestion library. For more information on the credential types supported in `azure-identity`, see the [Azure Identity library documentation](https://learn.microsoft.com/azure/developer/java/sdk/identity).
#### Setting audience for Non-public clouds
diff --git a/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/logging/DiagnosticTelemetryPipelineListener.java b/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/logging/DiagnosticTelemetryPipelineListener.java
index 6c80743d1189..ff0e0f6ba37d 100644
--- a/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/logging/DiagnosticTelemetryPipelineListener.java
+++ b/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/logging/DiagnosticTelemetryPipelineListener.java
@@ -128,8 +128,8 @@ public static String getErrorMessageFromCredentialRelatedResponse(int responseCo
}
String action = responseCode == 401
- ? ". Please provide Azure Active Directory credentials"
- : ". Please check your Azure Active Directory credentials, they might be incorrect or expired";
+ ? ". Please provide Microsoft Entra ID credentials"
+ : ". Please check your Microsoft Entra ID credentials, they might be incorrect or expired";
return message + action + " (telemetry will be stored to disk and retried)";
}
}
diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/logging/DiagnosticTelemetryPipelineListener.java b/sdk/monitor/azure-monitor-opentelemetry-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/logging/DiagnosticTelemetryPipelineListener.java
index 58fdd7f86ece..bc994fb539c0 100644
--- a/sdk/monitor/azure-monitor-opentelemetry-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/logging/DiagnosticTelemetryPipelineListener.java
+++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/logging/DiagnosticTelemetryPipelineListener.java
@@ -128,8 +128,8 @@ public static String getErrorMessageFromCredentialRelatedResponse(int responseCo
}
String action = responseCode == 401
- ? ". Please provide Azure Active Directory credentials"
- : ". Please check your Azure Active Directory credentials, they might be incorrect or expired";
+ ? ". Please provide Microsoft Entra ID credentials"
+ : ". Please check your Microsoft Entra ID credentials, they might be incorrect or expired";
return message + action + " (telemetry will be stored to disk and retried)";
}
}
diff --git a/sdk/monitor/azure-monitor-query-logs/TROUBLESHOOTING.md b/sdk/monitor/azure-monitor-query-logs/TROUBLESHOOTING.md
index fcbb792a5a26..712c7ba8fd52 100644
--- a/sdk/monitor/azure-monitor-query-logs/TROUBLESHOOTING.md
+++ b/sdk/monitor/azure-monitor-query-logs/TROUBLESHOOTING.md
@@ -69,7 +69,7 @@ clientBuilder.httpLogOptions(new HttpLogOptions().addAllowedHeaderName("safe-to-
### Authentication errors
-Azure Monitor Query supports Azure Active Directory authentication. LogsQueryClientBuilder has `credential` method to set the token credential. To provide a valid credential, you can use
+Azure Monitor Query supports Microsoft Entra ID authentication. LogsQueryClientBuilder has `credential` method to set the token credential. To provide a valid credential, you can use
`azure-identity` dependency. For more details on getting started, refer to
the [README](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/monitor/azure-monitor-query#create-the-client)
of Azure Monitor Query library. You can also refer to
diff --git a/sdk/monitor/azure-monitor-query-metrics/TROUBLESHOOTING.md b/sdk/monitor/azure-monitor-query-metrics/TROUBLESHOOTING.md
index 30eb7d39d315..2e8aec9a99a3 100644
--- a/sdk/monitor/azure-monitor-query-metrics/TROUBLESHOOTING.md
+++ b/sdk/monitor/azure-monitor-query-metrics/TROUBLESHOOTING.md
@@ -66,7 +66,7 @@ clientBuilder.httpLogOptions(new HttpLogOptions().addAllowedHeaderName("safe-to-
### Authentication errors
-Azure Monitor Query Metrics supports Azure Active Directory authentication. MetricsClientBuilder has a method to set the `credential`. To provide a valid credential, you can use
+Azure Monitor Query Metrics supports Microsoft Entra ID authentication. MetricsClientBuilder has a method to set the `credential`. To provide a valid credential, you can use
`azure-identity` dependency. For more details on getting started, refer to
the [README](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/monitor/azure-monitor-query-metrics#Synchronous-clients)
of Azure Monitor Query Metrics library. You can also refer to
diff --git a/sdk/monitor/azure-monitor-query/TROUBLESHOOTING.md b/sdk/monitor/azure-monitor-query/TROUBLESHOOTING.md
index 1f67f6578d95..9ae116e862c4 100644
--- a/sdk/monitor/azure-monitor-query/TROUBLESHOOTING.md
+++ b/sdk/monitor/azure-monitor-query/TROUBLESHOOTING.md
@@ -78,7 +78,7 @@ clientBuilder.httpLogOptions(new HttpLogOptions().addAllowedHeaderName("safe-to-
### Authentication errors
-Azure Monitor Query supports Azure Active Directory authentication. Both LogsQueryClientBuilder and
+Azure Monitor Query supports Microsoft Entra ID authentication. Both LogsQueryClientBuilder and
MetricsQueryClientBuilder have methods to set the `credential`. To provide a valid credential, you can use
`azure-identity` dependency. For more details on getting started, refer to
the [README](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/monitor/azure-monitor-query#create-the-client)
diff --git a/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/Identity.java b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/Identity.java
index 867d8960da46..17fb098c2e47 100644
--- a/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/Identity.java
+++ b/sdk/msi/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/models/Identity.java
@@ -22,23 +22,23 @@
public interface Identity
extends GroupableResource, Refreshable, Updatable {
/**
- * Gets the ID of the Azure Active Directory tenant to which the identity belongs to.
+ * Gets the ID of the Microsoft Entra ID tenant to which the identity belongs to.
*
- * @return id of the Azure Active Directory tenant to which the identity belongs to
+ * @return id of the Microsoft Entra ID tenant to which the identity belongs to
*/
String tenantId();
/**
- * Gets the ID of the Azure Active Directory service principal object associated with the identity.
+ * Gets the ID of the Microsoft Entra ID service principal object associated with the identity.
*
- * @return id of the Azure Active Directory service principal object associated with the identity
+ * @return id of the Microsoft Entra ID service principal object associated with the identity
*/
String principalId();
/**
- * Gets the ID of the Azure Active Directory application associated with the identity.
+ * Gets the ID of the Microsoft Entra ID application associated with the identity.
*
- * @return id of the Azure Active Directory application associated with the identity
+ * @return id of the Microsoft Entra ID application associated with the identity
*/
String clientId();
diff --git a/sdk/mysql/azure-resourcemanager-mysql/README.md b/sdk/mysql/azure-resourcemanager-mysql/README.md
index 6d06bb4df2c8..e8e202b9a496 100644
--- a/sdk/mysql/azure-resourcemanager-mysql/README.md
+++ b/sdk/mysql/azure-resourcemanager-mysql/README.md
@@ -45,7 +45,7 @@ Azure Management Libraries require a `TokenCredential` implementation for authen
### Authentication
-By default, Azure Active Directory token authentication depends on correct configure of following environment variables.
+By default, Microsoft Entra ID token authentication depends on correct configure of following environment variables.
- `AZURE_CLIENT_ID` for Azure client ID.
- `AZURE_TENANT_ID` for Azure tenant ID.
diff --git a/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/fluent/models/ServerInner.java b/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/fluent/models/ServerInner.java
index cdd858ac5d04..adce6fc6c412 100644
--- a/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/fluent/models/ServerInner.java
+++ b/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/fluent/models/ServerInner.java
@@ -30,7 +30,7 @@ public final class ServerInner extends Resource {
private final ClientLogger logger = new ClientLogger(ServerInner.class);
/*
- * The Azure Active Directory identity of the server.
+ * The Microsoft Entra ID identity of the server.
*/
@JsonProperty(value = "identity")
private ResourceIdentity identity;
@@ -48,7 +48,7 @@ public final class ServerInner extends Resource {
private ServerProperties innerProperties;
/**
- * Get the identity property: The Azure Active Directory identity of the server.
+ * Get the identity property: The Microsoft Entra ID identity of the server.
*
* @return the identity value.
*/
@@ -57,7 +57,7 @@ public ResourceIdentity identity() {
}
/**
- * Set the identity property: The Azure Active Directory identity of the server.
+ * Set the identity property: The Microsoft Entra ID identity of the server.
*
* @param identity the identity value to set.
* @return the ServerInner object itself.
diff --git a/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/models/ResourceIdentity.java b/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/models/ResourceIdentity.java
index 1597bf6eafde..91ea3c25d46f 100644
--- a/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/models/ResourceIdentity.java
+++ b/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/models/ResourceIdentity.java
@@ -10,34 +10,34 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.UUID;
-/** Azure Active Directory identity configuration for a resource. */
+/** Microsoft Entra ID identity configuration for a resource. */
@Fluent
public class ResourceIdentity {
@JsonIgnore
private final ClientLogger logger = new ClientLogger(ResourceIdentity.class);
/*
- * The Azure Active Directory principal id.
+ * The Microsoft Entra ID principal id.
*/
@JsonProperty(value = "principalId", access = JsonProperty.Access.WRITE_ONLY)
private UUID principalId;
/*
* The identity type. Set this to 'SystemAssigned' in order to
- * automatically create and assign an Azure Active Directory principal for
+ * automatically create and assign an Microsoft Entra ID principal for
* the resource.
*/
@JsonProperty(value = "type")
private IdentityType type;
/*
- * The Azure Active Directory tenant id.
+ * The Microsoft Entra ID tenant id.
*/
@JsonProperty(value = "tenantId", access = JsonProperty.Access.WRITE_ONLY)
private UUID tenantId;
/**
- * Get the principalId property: The Azure Active Directory principal id.
+ * Get the principalId property: The Microsoft Entra ID principal id.
*
* @return the principalId value.
*/
@@ -47,7 +47,7 @@ public UUID principalId() {
/**
* Get the type property: The identity type. Set this to 'SystemAssigned' in order to automatically create and
- * assign an Azure Active Directory principal for the resource.
+ * assign an Microsoft Entra ID principal for the resource.
*
* @return the type value.
*/
@@ -57,7 +57,7 @@ public IdentityType type() {
/**
* Set the type property: The identity type. Set this to 'SystemAssigned' in order to automatically create and
- * assign an Azure Active Directory principal for the resource.
+ * assign an Microsoft Entra ID principal for the resource.
*
* @param type the type value to set.
* @return the ResourceIdentity object itself.
@@ -68,7 +68,7 @@ public ResourceIdentity withType(IdentityType type) {
}
/**
- * Get the tenantId property: The Azure Active Directory tenant id.
+ * Get the tenantId property: The Microsoft Entra ID tenant id.
*
* @return the tenantId value.
*/
diff --git a/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/models/Server.java b/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/models/Server.java
index 0f4247e5d955..55150e73dafc 100644
--- a/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/models/Server.java
+++ b/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/models/Server.java
@@ -49,7 +49,7 @@ public interface Server {
Map tags();
/**
- * Gets the identity property: The Azure Active Directory identity of the server.
+ * Gets the identity property: The Microsoft Entra ID identity of the server.
*
* @return the identity value.
*/
@@ -279,9 +279,9 @@ interface WithTags {
/** The stage of the Server definition allowing to specify identity. */
interface WithIdentity {
/**
- * Specifies the identity property: The Azure Active Directory identity of the server..
+ * Specifies the identity property: The Microsoft Entra ID identity of the server..
*
- * @param identity The Azure Active Directory identity of the server.
+ * @param identity The Microsoft Entra ID identity of the server.
* @return the next definition stage.
*/
WithCreate withIdentity(ResourceIdentity identity);
@@ -343,9 +343,9 @@ interface WithTags {
/** The stage of the Server update allowing to specify identity. */
interface WithIdentity {
/**
- * Specifies the identity property: The Azure Active Directory identity of the server..
+ * Specifies the identity property: The Microsoft Entra ID identity of the server..
*
- * @param identity The Azure Active Directory identity of the server.
+ * @param identity The Microsoft Entra ID identity of the server.
* @return the next definition stage.
*/
Update withIdentity(ResourceIdentity identity);
diff --git a/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/models/ServerForCreate.java b/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/models/ServerForCreate.java
index d2c1795e2d61..58231fe3a4e3 100644
--- a/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/models/ServerForCreate.java
+++ b/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/models/ServerForCreate.java
@@ -18,7 +18,7 @@ public final class ServerForCreate {
private final ClientLogger logger = new ClientLogger(ServerForCreate.class);
/*
- * The Azure Active Directory identity of the server.
+ * The Microsoft Entra ID identity of the server.
*/
@JsonProperty(value = "identity")
private ResourceIdentity identity;
@@ -49,7 +49,7 @@ public final class ServerForCreate {
private Map tags;
/**
- * Get the identity property: The Azure Active Directory identity of the server.
+ * Get the identity property: The Microsoft Entra ID identity of the server.
*
* @return the identity value.
*/
@@ -58,7 +58,7 @@ public ResourceIdentity identity() {
}
/**
- * Set the identity property: The Azure Active Directory identity of the server.
+ * Set the identity property: The Microsoft Entra ID identity of the server.
*
* @param identity the identity value to set.
* @return the ServerForCreate object itself.
diff --git a/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/models/ServerUpdateParameters.java b/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/models/ServerUpdateParameters.java
index 5ec8c66fc92c..33099acb9f9c 100644
--- a/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/models/ServerUpdateParameters.java
+++ b/sdk/mysql/azure-resourcemanager-mysql/src/main/java/com/azure/resourcemanager/mysql/models/ServerUpdateParameters.java
@@ -19,7 +19,7 @@ public final class ServerUpdateParameters {
private final ClientLogger logger = new ClientLogger(ServerUpdateParameters.class);
/*
- * The Azure Active Directory identity of the server.
+ * The Microsoft Entra ID identity of the server.
*/
@JsonProperty(value = "identity")
private ResourceIdentity identity;
@@ -44,7 +44,7 @@ public final class ServerUpdateParameters {
private Map tags;
/**
- * Get the identity property: The Azure Active Directory identity of the server.
+ * Get the identity property: The Microsoft Entra ID identity of the server.
*
* @return the identity value.
*/
@@ -53,7 +53,7 @@ public ResourceIdentity identity() {
}
/**
- * Set the identity property: The Azure Active Directory identity of the server.
+ * Set the identity property: The Microsoft Entra ID identity of the server.
*
* @param identity the identity value to set.
* @return the ServerUpdateParameters object itself.
diff --git a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/BareMetalMachineKeySetInner.java b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/BareMetalMachineKeySetInner.java
index 2bec99e251f3..3eeb8c968dd8 100644
--- a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/BareMetalMachineKeySetInner.java
+++ b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/BareMetalMachineKeySetInner.java
@@ -169,7 +169,7 @@ public BareMetalMachineKeySetInner withTags(Map tags) {
}
/**
- * Get the azureGroupId property: The object ID of Azure Active Directory group that all users in the list must be
+ * Get the azureGroupId property: The object ID of Microsoft Entra ID group that all users in the list must be
* in for access to be granted. Users that are not in the group will not have access.
*
* @return the azureGroupId value.
@@ -179,7 +179,7 @@ public String azureGroupId() {
}
/**
- * Set the azureGroupId property: The object ID of Azure Active Directory group that all users in the list must be
+ * Set the azureGroupId property: The object ID of Microsoft Entra ID group that all users in the list must be
* in for access to be granted. Users that are not in the group will not have access.
*
* @param azureGroupId the azureGroupId value to set.
diff --git a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/BareMetalMachineKeySetProperties.java b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/BareMetalMachineKeySetProperties.java
index 7a4a514528af..cabc97eb9efd 100644
--- a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/BareMetalMachineKeySetProperties.java
+++ b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/BareMetalMachineKeySetProperties.java
@@ -26,7 +26,7 @@
@Fluent
public final class BareMetalMachineKeySetProperties implements JsonSerializable {
/*
- * The object ID of Azure Active Directory group that all users in the list must be in for access to be granted.
+ * The object ID of Microsoft Entra ID group that all users in the list must be in for access to be granted.
* Users that are not in the group will not have access.
*/
private String azureGroupId;
@@ -94,7 +94,7 @@ public BareMetalMachineKeySetProperties() {
}
/**
- * Get the azureGroupId property: The object ID of Azure Active Directory group that all users in the list must be
+ * Get the azureGroupId property: The object ID of Microsoft Entra ID group that all users in the list must be
* in for access to be granted. Users that are not in the group will not have access.
*
* @return the azureGroupId value.
@@ -104,7 +104,7 @@ public String azureGroupId() {
}
/**
- * Set the azureGroupId property: The object ID of Azure Active Directory group that all users in the list must be
+ * Set the azureGroupId property: The object ID of Microsoft Entra ID group that all users in the list must be
* in for access to be granted. Users that are not in the group will not have access.
*
* @param azureGroupId the azureGroupId value to set.
diff --git a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/BmcKeySetInner.java b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/BmcKeySetInner.java
index 739a39821163..4c0f1a44fd8c 100644
--- a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/BmcKeySetInner.java
+++ b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/BmcKeySetInner.java
@@ -169,7 +169,7 @@ public BmcKeySetInner withTags(Map tags) {
}
/**
- * Get the azureGroupId property: The object ID of Azure Active Directory group that all users in the list must be
+ * Get the azureGroupId property: The object ID of Microsoft Entra ID group that all users in the list must be
* in for access to be granted. Users that are not in the group will not have access.
*
* @return the azureGroupId value.
@@ -179,7 +179,7 @@ public String azureGroupId() {
}
/**
- * Set the azureGroupId property: The object ID of Azure Active Directory group that all users in the list must be
+ * Set the azureGroupId property: The object ID of Microsoft Entra ID group that all users in the list must be
* in for access to be granted. Users that are not in the group will not have access.
*
* @param azureGroupId the azureGroupId value to set.
diff --git a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/BmcKeySetProperties.java b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/BmcKeySetProperties.java
index a9088ef2a5ed..091e884a73dd 100644
--- a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/BmcKeySetProperties.java
+++ b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/BmcKeySetProperties.java
@@ -26,7 +26,7 @@
@Fluent
public final class BmcKeySetProperties implements JsonSerializable {
/*
- * The object ID of Azure Active Directory group that all users in the list must be in for access to be granted.
+ * The object ID of Microsoft Entra ID group that all users in the list must be in for access to be granted.
* Users that are not in the group will not have access.
*/
private String azureGroupId;
@@ -79,7 +79,7 @@ public BmcKeySetProperties() {
}
/**
- * Get the azureGroupId property: The object ID of Azure Active Directory group that all users in the list must be
+ * Get the azureGroupId property: The object ID of Microsoft Entra ID group that all users in the list must be
* in for access to be granted. Users that are not in the group will not have access.
*
* @return the azureGroupId value.
@@ -89,7 +89,7 @@ public String azureGroupId() {
}
/**
- * Set the azureGroupId property: The object ID of Azure Active Directory group that all users in the list must be
+ * Set the azureGroupId property: The object ID of Microsoft Entra ID group that all users in the list must be
* in for access to be granted. Users that are not in the group will not have access.
*
* @param azureGroupId the azureGroupId value to set.
diff --git a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/KubernetesClusterInner.java b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/KubernetesClusterInner.java
index da0b35556bc6..3df3f6c104ae 100644
--- a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/KubernetesClusterInner.java
+++ b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/KubernetesClusterInner.java
@@ -174,7 +174,7 @@ public KubernetesClusterInner withTags(Map tags) {
}
/**
- * Get the aadConfiguration property: The Azure Active Directory Integration properties.
+ * Get the aadConfiguration property: The Microsoft Entra ID Integration properties.
*
* @return the aadConfiguration value.
*/
@@ -183,7 +183,7 @@ public AadConfiguration aadConfiguration() {
}
/**
- * Set the aadConfiguration property: The Azure Active Directory Integration properties.
+ * Set the aadConfiguration property: The Microsoft Entra ID Integration properties.
*
* @param aadConfiguration the aadConfiguration value to set.
* @return the KubernetesClusterInner object itself.
diff --git a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/KubernetesClusterProperties.java b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/KubernetesClusterProperties.java
index 4d319f228b85..827f2f5440b5 100644
--- a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/KubernetesClusterProperties.java
+++ b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/fluent/models/KubernetesClusterProperties.java
@@ -29,7 +29,7 @@
@Fluent
public final class KubernetesClusterProperties implements JsonSerializable {
/*
- * The Azure Active Directory Integration properties.
+ * The Microsoft Entra ID Integration properties.
*/
private AadConfiguration aadConfiguration;
@@ -125,7 +125,7 @@ public KubernetesClusterProperties() {
}
/**
- * Get the aadConfiguration property: The Azure Active Directory Integration properties.
+ * Get the aadConfiguration property: The Microsoft Entra ID Integration properties.
*
* @return the aadConfiguration value.
*/
@@ -134,7 +134,7 @@ public AadConfiguration aadConfiguration() {
}
/**
- * Set the aadConfiguration property: The Azure Active Directory Integration properties.
+ * Set the aadConfiguration property: The Microsoft Entra ID Integration properties.
*
* @param aadConfiguration the aadConfiguration value to set.
* @return the KubernetesClusterProperties object itself.
diff --git a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/models/AadConfiguration.java b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/models/AadConfiguration.java
index 68a19ca31840..f41f8e47e763 100644
--- a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/models/AadConfiguration.java
+++ b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/models/AadConfiguration.java
@@ -13,12 +13,12 @@
import java.util.List;
/**
- * AadConfiguration represents the Azure Active Directory Integration properties.
+ * AadConfiguration represents the Microsoft Entra ID Integration properties.
*/
@Fluent
public final class AadConfiguration implements JsonSerializable {
/*
- * The list of Azure Active Directory group object IDs that will have an administrative role on the Kubernetes
+ * The list of Microsoft Entra ID group object IDs that will have an administrative role on the Kubernetes
* cluster.
*/
private List adminGroupObjectIds;
@@ -30,7 +30,7 @@ public AadConfiguration() {
}
/**
- * Get the adminGroupObjectIds property: The list of Azure Active Directory group object IDs that will have an
+ * Get the adminGroupObjectIds property: The list of Microsoft Entra ID group object IDs that will have an
* administrative role on the Kubernetes cluster.
*
* @return the adminGroupObjectIds value.
@@ -40,7 +40,7 @@ public List adminGroupObjectIds() {
}
/**
- * Set the adminGroupObjectIds property: The list of Azure Active Directory group object IDs that will have an
+ * Set the adminGroupObjectIds property: The list of Microsoft Entra ID group object IDs that will have an
* administrative role on the Kubernetes cluster.
*
* @param adminGroupObjectIds the adminGroupObjectIds value to set.
diff --git a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/models/BareMetalMachineKeySet.java b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/models/BareMetalMachineKeySet.java
index 5aa8bd7dca62..af500632a49a 100644
--- a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/models/BareMetalMachineKeySet.java
+++ b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/models/BareMetalMachineKeySet.java
@@ -77,7 +77,7 @@ public interface BareMetalMachineKeySet {
SystemData systemData();
/**
- * Gets the azureGroupId property: The object ID of Azure Active Directory group that all users in the list must be
+ * Gets the azureGroupId property: The object ID of Microsoft Entra ID group that all users in the list must be
* in for access to be granted. Users that are not in the group will not have access.
*
* @return the azureGroupId value.
@@ -267,10 +267,10 @@ interface WithExtendedLocation {
*/
interface WithAzureGroupId {
/**
- * Specifies the azureGroupId property: The object ID of Azure Active Directory group that all users in the
+ * Specifies the azureGroupId property: The object ID of Microsoft Entra ID group that all users in the
* list must be in for access to be granted. Users that are not in the group will not have access..
*
- * @param azureGroupId The object ID of Azure Active Directory group that all users in the list must be in
+ * @param azureGroupId The object ID of Microsoft Entra ID group that all users in the list must be in
* for access to be granted. Users that are not in the group will not have access.
* @return the next definition stage.
*/
diff --git a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/models/BmcKeySet.java b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/models/BmcKeySet.java
index bb843eae60c0..5195394a3bc5 100644
--- a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/models/BmcKeySet.java
+++ b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/models/BmcKeySet.java
@@ -77,7 +77,7 @@ public interface BmcKeySet {
SystemData systemData();
/**
- * Gets the azureGroupId property: The object ID of Azure Active Directory group that all users in the list must be
+ * Gets the azureGroupId property: The object ID of Microsoft Entra ID group that all users in the list must be
* in for access to be granted. Users that are not in the group will not have access.
*
* @return the azureGroupId value.
@@ -243,10 +243,10 @@ interface WithExtendedLocation {
*/
interface WithAzureGroupId {
/**
- * Specifies the azureGroupId property: The object ID of Azure Active Directory group that all users in the
+ * Specifies the azureGroupId property: The object ID of Microsoft Entra ID group that all users in the
* list must be in for access to be granted. Users that are not in the group will not have access..
*
- * @param azureGroupId The object ID of Azure Active Directory group that all users in the list must be in
+ * @param azureGroupId The object ID of Microsoft Entra ID group that all users in the list must be in
* for access to be granted. Users that are not in the group will not have access.
* @return the next definition stage.
*/
diff --git a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/models/KubernetesCluster.java b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/models/KubernetesCluster.java
index e9fc6e6292c2..fae4bac4d526 100644
--- a/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/models/KubernetesCluster.java
+++ b/sdk/networkcloud/azure-resourcemanager-networkcloud/src/main/java/com/azure/resourcemanager/networkcloud/models/KubernetesCluster.java
@@ -76,7 +76,7 @@ public interface KubernetesCluster {
SystemData systemData();
/**
- * Gets the aadConfiguration property: The Azure Active Directory Integration properties.
+ * Gets the aadConfiguration property: The Microsoft Entra ID Integration properties.
*
* @return the aadConfiguration value.
*/
@@ -404,9 +404,9 @@ interface WithTags {
*/
interface WithAadConfiguration {
/**
- * Specifies the aadConfiguration property: The Azure Active Directory Integration properties..
+ * Specifies the aadConfiguration property: The Microsoft Entra ID Integration properties..
*
- * @param aadConfiguration The Azure Active Directory Integration properties.
+ * @param aadConfiguration The Microsoft Entra ID Integration properties.
* @return the next definition stage.
*/
WithCreate withAadConfiguration(AadConfiguration aadConfiguration);
diff --git a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/UserSecurityContext.java b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/UserSecurityContext.java
index 9fd94f9924fc..1924cbae42c3 100644
--- a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/UserSecurityContext.java
+++ b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/models/UserSecurityContext.java
@@ -28,7 +28,7 @@ public final class UserSecurityContext implements JsonSerializable {
diff --git a/sdk/postgresql/azure-resourcemanager-postgresql/src/main/java/com/azure/resourcemanager/postgresql/models/ResourceIdentity.java b/sdk/postgresql/azure-resourcemanager-postgresql/src/main/java/com/azure/resourcemanager/postgresql/models/ResourceIdentity.java
index 3b8eb988e32b..c2d0a49491ae 100644
--- a/sdk/postgresql/azure-resourcemanager-postgresql/src/main/java/com/azure/resourcemanager/postgresql/models/ResourceIdentity.java
+++ b/sdk/postgresql/azure-resourcemanager-postgresql/src/main/java/com/azure/resourcemanager/postgresql/models/ResourceIdentity.java
@@ -13,12 +13,12 @@
import java.util.UUID;
/**
- * Azure Active Directory identity configuration for a resource.
+ * Microsoft Entra ID identity configuration for a resource.
*/
@Fluent
public final class ResourceIdentity implements JsonSerializable {
/*
- * The Azure Active Directory principal id.
+ * The Microsoft Entra ID principal id.
*/
private UUID principalId;
@@ -29,7 +29,7 @@ public final class ResourceIdentity implements JsonSerializable tags();
/**
- * Gets the identity property: The Azure Active Directory identity of the server.
+ * Gets the identity property: The Microsoft Entra ID identity of the server.
*
* @return the identity value.
*/
@@ -304,9 +304,9 @@ interface WithTags {
*/
interface WithIdentity {
/**
- * Specifies the identity property: The Azure Active Directory identity of the server..
+ * Specifies the identity property: The Microsoft Entra ID identity of the server..
*
- * @param identity The Azure Active Directory identity of the server.
+ * @param identity The Microsoft Entra ID identity of the server.
* @return the next definition stage.
*/
WithCreate withIdentity(ResourceIdentity identity);
@@ -378,9 +378,9 @@ interface WithTags {
*/
interface WithIdentity {
/**
- * Specifies the identity property: The Azure Active Directory identity of the server..
+ * Specifies the identity property: The Microsoft Entra ID identity of the server..
*
- * @param identity The Azure Active Directory identity of the server.
+ * @param identity The Microsoft Entra ID identity of the server.
* @return the next definition stage.
*/
Update withIdentity(ResourceIdentity identity);
diff --git a/sdk/postgresql/azure-resourcemanager-postgresql/src/main/java/com/azure/resourcemanager/postgresql/models/ServerForCreate.java b/sdk/postgresql/azure-resourcemanager-postgresql/src/main/java/com/azure/resourcemanager/postgresql/models/ServerForCreate.java
index fe65bac756ef..00b0d115cbc9 100644
--- a/sdk/postgresql/azure-resourcemanager-postgresql/src/main/java/com/azure/resourcemanager/postgresql/models/ServerForCreate.java
+++ b/sdk/postgresql/azure-resourcemanager-postgresql/src/main/java/com/azure/resourcemanager/postgresql/models/ServerForCreate.java
@@ -19,7 +19,7 @@
@Fluent
public final class ServerForCreate implements JsonSerializable {
/*
- * The Azure Active Directory identity of the server.
+ * The Microsoft Entra ID identity of the server.
*/
private ResourceIdentity identity;
@@ -50,7 +50,7 @@ public ServerForCreate() {
}
/**
- * Get the identity property: The Azure Active Directory identity of the server.
+ * Get the identity property: The Microsoft Entra ID identity of the server.
*
* @return the identity value.
*/
@@ -59,7 +59,7 @@ public ResourceIdentity identity() {
}
/**
- * Set the identity property: The Azure Active Directory identity of the server.
+ * Set the identity property: The Microsoft Entra ID identity of the server.
*
* @param identity the identity value to set.
* @return the ServerForCreate object itself.
diff --git a/sdk/postgresql/azure-resourcemanager-postgresql/src/main/java/com/azure/resourcemanager/postgresql/models/ServerUpdateParameters.java b/sdk/postgresql/azure-resourcemanager-postgresql/src/main/java/com/azure/resourcemanager/postgresql/models/ServerUpdateParameters.java
index 7597f957b084..246507197032 100644
--- a/sdk/postgresql/azure-resourcemanager-postgresql/src/main/java/com/azure/resourcemanager/postgresql/models/ServerUpdateParameters.java
+++ b/sdk/postgresql/azure-resourcemanager-postgresql/src/main/java/com/azure/resourcemanager/postgresql/models/ServerUpdateParameters.java
@@ -19,7 +19,7 @@
@Fluent
public final class ServerUpdateParameters implements JsonSerializable {
/*
- * The Azure Active Directory identity of the server.
+ * The Microsoft Entra ID identity of the server.
*/
private ResourceIdentity identity;
@@ -45,7 +45,7 @@ public ServerUpdateParameters() {
}
/**
- * Get the identity property: The Azure Active Directory identity of the server.
+ * Get the identity property: The Microsoft Entra ID identity of the server.
*
* @return the identity value.
*/
@@ -54,7 +54,7 @@ public ResourceIdentity identity() {
}
/**
- * Set the identity property: The Azure Active Directory identity of the server.
+ * Set the identity property: The Microsoft Entra ID identity of the server.
*
* @param identity the identity value to set.
* @return the ServerUpdateParameters object itself.
diff --git a/sdk/purview/azure-analytics-purview-administration/README.md b/sdk/purview/azure-analytics-purview-administration/README.md
index 15194ccf0e06..2eb8855c15ad 100644
--- a/sdk/purview/azure-analytics-purview-administration/README.md
+++ b/sdk/purview/azure-analytics-purview-administration/README.md
@@ -33,7 +33,7 @@ For more information about permissions, see [here][azure_purview_permissions].
### Authenticate the client
-In order to interact with the Azure Purview service, your client must present an Azure Active Directory bearer token to the service.
+In order to interact with the Azure Purview service, your client must present an Microsoft Entra ID bearer token to the service.
After setup, you can choose which type of [credential][azure_identity_credential_type] from `azure-identity` to use.
We recommend using [DefaultAzureCredential][identity_dac], configured through the `AZURE_TOKEN_CREDENTIALS` environment variable.
@@ -41,9 +41,9 @@ Set this variable as described in the [Learn documentation][customize_defaultAzu
You can find more ways to authenticate with [azure-identity][azure_identity].
-#### Create AccountsClient with Azure Active Directory Credential
+#### Create AccountsClient with Microsoft Entra ID Credential
-You can authenticate with Azure Active Directory using the [Azure Identity library][azure_identity].
+You can authenticate with Microsoft Entra ID using the [Azure Identity library][azure_identity].
To use the [DefaultAzureCredential][DefaultAzureCredential] provider shown below, or other credential providers provided with the Azure SDK, please include the `azure-identity` package:
diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/ContactInfo.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/ContactInfo.java
index c0f82d7b93b2..1a8d0b06db9d 100644
--- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/ContactInfo.java
+++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/ContactInfo.java
@@ -18,7 +18,7 @@
@Fluent
public final class ContactInfo implements JsonSerializable {
/*
- * Azure Active Directory object Id.
+ * Microsoft Entra ID object Id.
*/
@Generated
private String id;
@@ -37,7 +37,7 @@ public ContactInfo() {
}
/**
- * Get the id property: Azure Active Directory object Id.
+ * Get the id property: Microsoft Entra ID object Id.
*
* @return the id value.
*/
@@ -47,7 +47,7 @@ public String getId() {
}
/**
- * Set the id property: Azure Active Directory object Id.
+ * Set the id property: Microsoft Entra ID object Id.
*
* @param id the id value to set.
* @return the ContactInfo object itself.
diff --git a/sdk/purview/azure-analytics-purview-scanning/README.md b/sdk/purview/azure-analytics-purview-scanning/README.md
index 3a1f15e6ff16..7c9ef39720f1 100644
--- a/sdk/purview/azure-analytics-purview-scanning/README.md
+++ b/sdk/purview/azure-analytics-purview-scanning/README.md
@@ -34,7 +34,7 @@ For more information about creating the account see [here][create_azure_purview_
### Authenticate the client
-In order to interact with the Azure Purview service, your client must present an Azure Active Directory bearer token to the service.
+In order to interact with the Azure Purview service, your client must present an Microsoft Entra ID bearer token to the service.
After setup, you can choose which type of [credential][azure_identity_credential_type] from `azure-identity` to use.
We recommend using [DefaultAzureCredential][identity_dac], configured through the `AZURE_TOKEN_CREDENTIALS` environment variable.
@@ -43,9 +43,9 @@ Set this variable as described in the [Learn documentation][customize_defaultAzu
You can find more ways to authenticate with [azure-identity][azure_identity].
-#### Create SystemScanRulesetsClient with Azure Active Directory Credential
+#### Create SystemScanRulesetsClient with Microsoft Entra ID Credential
-You can authenticate with Azure Active Directory using the [Azure Identity library][azure_identity].
+You can authenticate with Microsoft Entra ID using the [Azure Identity library][azure_identity].
To use the [DefaultAzureCredential][DefaultAzureCredential] provider shown below, or other credential providers provided with the Azure SDK, please include the `azure-identity` package:
diff --git a/sdk/purview/azure-analytics-purview-workflow/README.md b/sdk/purview/azure-analytics-purview-workflow/README.md
index 6e5751ac7b2b..061b8cba3150 100644
--- a/sdk/purview/azure-analytics-purview-workflow/README.md
+++ b/sdk/purview/azure-analytics-purview-workflow/README.md
@@ -20,7 +20,7 @@ Use the client library for Purview Workflow to:
### Authentication
-Since the Workflow service uses an Azure Active Directory (AAD) bearer token for authentication and identification, an email address should be encoded into the token to allow for notification when using Workflow. It is recommended that the [Azure Identity][azure_identity] library be used with a the [UsernamePasswordCredential][username_password_credential]. Before using the [Azure Identity][azure_identity] library with Workflow, [an application][app_registration] should be registered and used for the clientId passed to the [UsernamePasswordCredential][username_password_credential].
+Since the Workflow service uses an Microsoft Entra ID (AAD) bearer token for authentication and identification, an email address should be encoded into the token to allow for notification when using Workflow. It is recommended that the [Azure Identity][azure_identity] library be used with a the [UsernamePasswordCredential][username_password_credential]. Before using the [Azure Identity][azure_identity] library with Workflow, [an application][app_registration] should be registered and used for the clientId passed to the [UsernamePasswordCredential][username_password_credential].
To use the [UsernamePasswordCredential][username_password_credential] provider shown below, or other credential providers provided with the Azure SDK, please include the `azure-identity` package:
diff --git a/sdk/quantum/azure-resourcemanager-quantum/src/main/java/com/azure/resourcemanager/quantum/models/ProviderProperties.java b/sdk/quantum/azure-resourcemanager-quantum/src/main/java/com/azure/resourcemanager/quantum/models/ProviderProperties.java
index 47addda0e38c..c6df591d12b1 100644
--- a/sdk/quantum/azure-resourcemanager-quantum/src/main/java/com/azure/resourcemanager/quantum/models/ProviderProperties.java
+++ b/sdk/quantum/azure-resourcemanager-quantum/src/main/java/com/azure/resourcemanager/quantum/models/ProviderProperties.java
@@ -38,7 +38,7 @@ public final class ProviderProperties implements JsonSerializable {
diff --git a/sdk/recoveryservicessiterecovery/azure-resourcemanager-recoveryservicessiterecovery/src/main/java/com/azure/resourcemanager/recoveryservicessiterecovery/models/IdentityProviderDetails.java b/sdk/recoveryservicessiterecovery/azure-resourcemanager-recoveryservicessiterecovery/src/main/java/com/azure/resourcemanager/recoveryservicessiterecovery/models/IdentityProviderDetails.java
index f395e8e0b063..d9335d218c29 100644
--- a/sdk/recoveryservicessiterecovery/azure-resourcemanager-recoveryservicessiterecovery/src/main/java/com/azure/resourcemanager/recoveryservicessiterecovery/models/IdentityProviderDetails.java
+++ b/sdk/recoveryservicessiterecovery/azure-resourcemanager-recoveryservicessiterecovery/src/main/java/com/azure/resourcemanager/recoveryservicessiterecovery/models/IdentityProviderDetails.java
@@ -41,7 +41,7 @@ public final class IdentityProviderDetails implements JsonSerializable {
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 7d86bba45d1b..0930c6f76c49 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
@@ -19,12 +19,12 @@
@Immutable
public final class AccountEntityProperties extends EntityCommonProperties {
/*
- * The Azure Active Directory tenant id.
+ * The Microsoft Entra ID tenant id.
*/
private String aadTenantId;
/*
- * The Azure Active Directory user id.
+ * The Microsoft Entra ID user id.
*/
private String aadUserId;
@@ -60,7 +60,7 @@ public final class AccountEntityProperties extends EntityCommonProperties {
private UUID objectGuid;
/*
- * The Azure Active Directory Passport User ID.
+ * The Microsoft Entra ID Passport User ID.
*/
private String puid;
@@ -97,7 +97,7 @@ public AccountEntityProperties() {
}
/**
- * Get the aadTenantId property: The Azure Active Directory tenant id.
+ * Get the aadTenantId property: The Microsoft Entra ID tenant id.
*
* @return the aadTenantId value.
*/
@@ -106,7 +106,7 @@ public String aadTenantId() {
}
/**
- * Get the aadUserId property: The Azure Active Directory user id.
+ * Get the aadUserId property: The Microsoft Entra ID user id.
*
* @return the aadUserId value.
*/
@@ -173,7 +173,7 @@ public UUID objectGuid() {
}
/**
- * Get the puid property: The Azure Active Directory Passport User ID.
+ * Get the puid property: The Microsoft Entra ID Passport User ID.
*
* @return the puid value.
*/
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 d2a5df252233..60b326457618 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
@@ -14,7 +14,7 @@
import java.io.IOException;
/**
- * Represents AAD (Azure Active Directory) data connector.
+ * Represents AAD (Microsoft Entra ID) data connector.
*/
@Fluent
public final class AadDataConnector extends DataConnectorInner {
@@ -24,7 +24,7 @@ public final class AadDataConnector extends DataConnectorInner {
private DataConnectorKind kind = DataConnectorKind.AZURE_ACTIVE_DIRECTORY;
/*
- * AAD (Azure Active Directory) data connector properties.
+ * AAD (Microsoft Entra ID) data connector properties.
*/
private AadDataConnectorProperties innerProperties;
@@ -65,7 +65,7 @@ public DataConnectorKind kind() {
}
/**
- * Get the innerProperties property: AAD (Azure Active Directory) data connector properties.
+ * Get the innerProperties property: AAD (Microsoft Entra ID) data connector properties.
*
* @return the innerProperties value.
*/
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 2d9037942489..335d186c3fea 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
@@ -115,7 +115,7 @@ public String id() {
}
/**
- * Get the aadTenantId property: The Azure Active Directory tenant id.
+ * Get the aadTenantId property: The Microsoft Entra ID tenant id.
*
* @return the aadTenantId value.
*/
@@ -124,7 +124,7 @@ public String aadTenantId() {
}
/**
- * Get the aadUserId property: The Azure Active Directory user id.
+ * Get the aadUserId property: The Microsoft Entra ID user id.
*
* @return the aadUserId value.
*/
@@ -191,7 +191,7 @@ public UUID objectGuid() {
}
/**
- * Get the puid property: The Azure Active Directory Passport User ID.
+ * Get the puid property: The Microsoft Entra ID Passport User ID.
*
* @return the puid value.
*/
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MicrosoftSecurityProductName.java b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MicrosoftSecurityProductName.java
index 03eede753943..a33187634f15 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MicrosoftSecurityProductName.java
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/src/main/java/com/azure/resourcemanager/securityinsights/models/MicrosoftSecurityProductName.java
@@ -29,7 +29,7 @@ public final class MicrosoftSecurityProductName extends ExpandableStringEnum {
diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/properties/AadB2cProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/properties/AadB2cProperties.java
index 2444c052aaf0..2fca564b0993 100644
--- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/properties/AadB2cProperties.java
+++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/properties/AadB2cProperties.java
@@ -17,7 +17,7 @@
import static org.springframework.security.oauth2.core.AuthorizationGrantType.CLIENT_CREDENTIALS;
/**
- * Configuration properties for Azure Active Directory B2C.
+ * Configuration properties for Microsoft Entra ID B2C.
*/
public class AadB2cProperties implements InitializingBean {
diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/properties/core/profile/AzureProfileConfigurationProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/properties/core/profile/AzureProfileConfigurationProperties.java
index b42e226e30bd..af34fb6cc4cf 100644
--- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/properties/core/profile/AzureProfileConfigurationProperties.java
+++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/properties/core/profile/AzureProfileConfigurationProperties.java
@@ -100,11 +100,11 @@ public static final class AzureEnvironmentConfigurationProperties implements Azu
*/
private String activeDirectoryResourceId;
/**
- * The Azure Active Directory Graph endpoint.
+ * The Microsoft Entra ID Graph endpoint.
*/
private String activeDirectoryGraphEndpoint;
/**
- * The Azure Active Directory Graph API version.
+ * The Microsoft Entra ID Graph API version.
*/
private String activeDirectoryGraphApiVersion;
/**
diff --git a/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/properties/profile/AzureEnvironmentProperties.java b/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/properties/profile/AzureEnvironmentProperties.java
index 0a354b00c8d7..49e42a40737a 100644
--- a/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/properties/profile/AzureEnvironmentProperties.java
+++ b/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/properties/profile/AzureEnvironmentProperties.java
@@ -69,11 +69,11 @@ public class AzureEnvironmentProperties implements AzureProfileOptionsProvider.A
*/
private String activeDirectoryResourceId;
/**
- * The Azure Active Directory Graph endpoint.
+ * The Microsoft Entra ID Graph endpoint.
*/
private String activeDirectoryGraphEndpoint;
/**
- * The Azure Active Directory Graph API version.
+ * The Microsoft Entra ID Graph API version.
*/
private String activeDirectoryGraphApiVersion;
/**
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/ManagedInstanceAzureADOnlyAuthenticationsClient.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/ManagedInstanceAzureADOnlyAuthenticationsClient.java
index ca7fa5bccbc7..70c7e49864e5 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/ManagedInstanceAzureADOnlyAuthenticationsClient.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/ManagedInstanceAzureADOnlyAuthenticationsClient.java
@@ -25,15 +25,15 @@
*/
public interface ManagedInstanceAzureADOnlyAuthenticationsClient {
/**
- * Gets a specific Azure Active Directory only authentication property.
+ * Gets a specific Microsoft Entra ID-only authentication property.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 specific Azure Active Directory only authentication property along with {@link Response} on successful
+ * @return a specific Microsoft Entra ID-only authentication property along with {@link Response} on successful
* completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
@@ -41,46 +41,46 @@ Mono> getWithResponseAsy
String managedInstanceName, AuthenticationName authenticationName);
/**
- * Gets a specific Azure Active Directory only authentication property.
+ * Gets a specific Microsoft Entra ID-only authentication property.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 specific Azure Active Directory only authentication property on successful completion of {@link Mono}.
+ * @return a specific Microsoft Entra ID-only authentication property on successful completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Mono getAsync(String resourceGroupName, String managedInstanceName,
AuthenticationName authenticationName);
/**
- * Gets a specific Azure Active Directory only authentication property.
+ * Gets a specific Microsoft Entra ID-only authentication property.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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 specific Azure Active Directory only authentication property along with {@link Response}.
+ * @return a specific Microsoft Entra ID-only authentication property along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Response getWithResponse(String resourceGroupName,
String managedInstanceName, AuthenticationName authenticationName, Context context);
/**
- * Gets a specific Azure Active Directory only authentication property.
+ * Gets a specific Microsoft Entra ID-only authentication property.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 specific Azure Active Directory only authentication property.
+ * @return a specific Microsoft Entra ID-only authentication property.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
ManagedInstanceAzureADOnlyAuthenticationInner get(String resourceGroupName, String managedInstanceName,
@@ -92,13 +92,13 @@ ManagedInstanceAzureADOnlyAuthenticationInner get(String resourceGroupName, Stri
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return azure Active Directory only authentication along with {@link Response} on successful completion of
+ * @return Microsoft Entra ID-only authentication along with {@link Response} on successful completion of
* {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
@@ -112,13 +112,13 @@ Mono>> createOrUpdateWithResponseAsync(String resource
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 PollerFlux} for polling of azure Active Directory only authentication.
+ * @return the {@link PollerFlux} for polling of Microsoft Entra ID-only authentication.
*/
@ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
PollerFlux, ManagedInstanceAzureADOnlyAuthenticationInner>
@@ -131,13 +131,13 @@ Mono>> createOrUpdateWithResponseAsync(String resource
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 SyncPoller} for polling of azure Active Directory only authentication.
+ * @return the {@link SyncPoller} for polling of Microsoft Entra ID-only authentication.
*/
@ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, ManagedInstanceAzureADOnlyAuthenticationInner>
@@ -150,14 +150,14 @@ Mono>> createOrUpdateWithResponseAsync(String resource
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @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 SyncPoller} for polling of azure Active Directory only authentication.
+ * @return the {@link SyncPoller} for polling of Microsoft Entra ID-only authentication.
*/
@ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, ManagedInstanceAzureADOnlyAuthenticationInner>
@@ -170,13 +170,13 @@ Mono>> createOrUpdateWithResponseAsync(String resource
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return azure Active Directory only authentication on successful completion of {@link Mono}.
+ * @return Microsoft Entra ID-only authentication on successful completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Mono createOrUpdateAsync(String resourceGroupName,
@@ -189,13 +189,13 @@ Mono createOrUpdateAsync(String r
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return azure Active Directory only authentication.
+ * @return Microsoft Entra ID-only authentication.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
ManagedInstanceAzureADOnlyAuthenticationInner createOrUpdate(String resourceGroupName, String managedInstanceName,
@@ -207,14 +207,14 @@ ManagedInstanceAzureADOnlyAuthenticationInner createOrUpdate(String resourceGrou
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @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 azure Active Directory only authentication.
+ * @return Microsoft Entra ID-only authentication.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
ManagedInstanceAzureADOnlyAuthenticationInner createOrUpdate(String resourceGroupName, String managedInstanceName,
@@ -226,7 +226,7 @@ ManagedInstanceAzureADOnlyAuthenticationInner createOrUpdate(String resourceGrou
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -241,7 +241,7 @@ Mono>> deleteWithResponseAsync(String resourceGroupNam
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -256,7 +256,7 @@ PollerFlux, Void> beginDeleteAsync(String resourceGroupName, St
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -271,7 +271,7 @@ SyncPoller, Void> beginDelete(String resourceGroupName, String
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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.
@@ -287,7 +287,7 @@ SyncPoller, Void> beginDelete(String resourceGroupName, String
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -301,7 +301,7 @@ SyncPoller, Void> beginDelete(String resourceGroupName, String
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -314,7 +314,7 @@ SyncPoller, Void> beginDelete(String resourceGroupName, String
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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.
@@ -325,14 +325,14 @@ void delete(String resourceGroupName, String managedInstanceName, Authentication
Context context);
/**
- * Gets a list of server Azure Active Directory only authentications.
+ * Gets a list of server Microsoft Entra ID-only authentications.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 list of server Azure Active Directory only authentications as paginated response with
+ * @return a list of server Microsoft Entra ID-only authentications as paginated response with
* {@link PagedFlux}.
*/
@ServiceMethod(returns = ReturnType.COLLECTION)
@@ -340,14 +340,14 @@ PagedFlux listByInstanceAsync(Str
String managedInstanceName);
/**
- * Gets a list of server Azure Active Directory only authentications.
+ * Gets a list of server Microsoft Entra ID-only authentications.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 list of server Azure Active Directory only authentications as paginated response with
+ * @return a list of server Microsoft Entra ID-only authentications as paginated response with
* {@link PagedIterable}.
*/
@ServiceMethod(returns = ReturnType.COLLECTION)
@@ -355,7 +355,7 @@ PagedIterable listByInstance(Stri
String managedInstanceName);
/**
- * Gets a list of server Azure Active Directory only authentications.
+ * Gets a list of server Microsoft Entra ID-only authentications.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
@@ -363,7 +363,7 @@ PagedIterable listByInstance(Stri
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 list of server Azure Active Directory only authentications as paginated response with
+ * @return a list of server Microsoft Entra ID-only authentications as paginated response with
* {@link PagedIterable}.
*/
@ServiceMethod(returns = ReturnType.COLLECTION)
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/ServerAzureADAdministratorsClient.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/ServerAzureADAdministratorsClient.java
index 2762eb4cd5db..cb2fe8467bff 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/ServerAzureADAdministratorsClient.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/ServerAzureADAdministratorsClient.java
@@ -24,7 +24,7 @@
*/
public interface ServerAzureADAdministratorsClient {
/**
- * Gets a Azure Active Directory administrator.
+ * Gets a Microsoft Entra ID administrator.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
@@ -32,7 +32,7 @@ public interface ServerAzureADAdministratorsClient {
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 Azure Active Directory administrator along with {@link Response} on successful completion of
+ * @return a Microsoft Entra ID administrator along with {@link Response} on successful completion of
* {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
@@ -40,7 +40,7 @@ Mono> getWithResponseAsync(String reso
AdministratorName administratorName);
/**
- * Gets a Azure Active Directory administrator.
+ * Gets a Microsoft Entra ID administrator.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
@@ -48,14 +48,14 @@ Mono> getWithResponseAsync(String reso
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 Azure Active Directory administrator on successful completion of {@link Mono}.
+ * @return a Microsoft Entra ID administrator on successful completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Mono getAsync(String resourceGroupName, String serverName,
AdministratorName administratorName);
/**
- * Gets a Azure Active Directory administrator.
+ * Gets a Microsoft Entra ID administrator.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
@@ -64,14 +64,14 @@ Mono getAsync(String resourceGroupName, String
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 Azure Active Directory administrator along with {@link Response}.
+ * @return a Microsoft Entra ID administrator along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Response getWithResponse(String resourceGroupName, String serverName,
AdministratorName administratorName, Context context);
/**
- * Gets a Azure Active Directory administrator.
+ * Gets a Microsoft Entra ID administrator.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
@@ -79,23 +79,23 @@ Response getWithResponse(String resourceGroupNa
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 Azure Active Directory administrator.
+ * @return a Microsoft Entra ID administrator.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
ServerAzureADAdministratorInner get(String resourceGroupName, String serverName,
AdministratorName administratorName);
/**
- * Creates or updates an existing Azure Active Directory administrator.
+ * Creates or updates an existing Microsoft Entra ID administrator.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
* @param administratorName The name of server active directory administrator.
- * @param parameters The requested Azure Active Directory administrator Resource state.
+ * @param parameters The requested Microsoft Entra ID administrator Resource state.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return azure Active Directory administrator along with {@link Response} on successful completion of
+ * @return Microsoft Entra ID administrator along with {@link Response} on successful completion of
* {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
@@ -103,16 +103,16 @@ Mono>> createOrUpdateWithResponseAsync(String resource
AdministratorName administratorName, ServerAzureADAdministratorInner parameters);
/**
- * Creates or updates an existing Azure Active Directory administrator.
+ * Creates or updates an existing Microsoft Entra ID administrator.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
* @param administratorName The name of server active directory administrator.
- * @param parameters The requested Azure Active Directory administrator Resource state.
+ * @param parameters The requested Microsoft Entra ID administrator Resource state.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 PollerFlux} for polling of azure Active Directory administrator.
+ * @return the {@link PollerFlux} for polling of Microsoft Entra ID administrator.
*/
@ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
PollerFlux, ServerAzureADAdministratorInner> beginCreateOrUpdateAsync(
@@ -120,16 +120,16 @@ PollerFlux, ServerAzureADAdministrat
ServerAzureADAdministratorInner parameters);
/**
- * Creates or updates an existing Azure Active Directory administrator.
+ * Creates or updates an existing Microsoft Entra ID administrator.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
* @param administratorName The name of server active directory administrator.
- * @param parameters The requested Azure Active Directory administrator Resource state.
+ * @param parameters The requested Microsoft Entra ID administrator Resource state.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 SyncPoller} for polling of azure Active Directory administrator.
+ * @return the {@link SyncPoller} for polling of Microsoft Entra ID administrator.
*/
@ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, ServerAzureADAdministratorInner> beginCreateOrUpdate(
@@ -137,17 +137,17 @@ SyncPoller, ServerAzureADAdministrat
ServerAzureADAdministratorInner parameters);
/**
- * Creates or updates an existing Azure Active Directory administrator.
+ * Creates or updates an existing Microsoft Entra ID administrator.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
* @param administratorName The name of server active directory administrator.
- * @param parameters The requested Azure Active Directory administrator Resource state.
+ * @param parameters The requested Microsoft Entra ID administrator Resource state.
* @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 SyncPoller} for polling of azure Active Directory administrator.
+ * @return the {@link SyncPoller} for polling of Microsoft Entra ID administrator.
*/
@ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, ServerAzureADAdministratorInner> beginCreateOrUpdate(
@@ -155,56 +155,56 @@ SyncPoller, ServerAzureADAdministrat
ServerAzureADAdministratorInner parameters, Context context);
/**
- * Creates or updates an existing Azure Active Directory administrator.
+ * Creates or updates an existing Microsoft Entra ID administrator.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
* @param administratorName The name of server active directory administrator.
- * @param parameters The requested Azure Active Directory administrator Resource state.
+ * @param parameters The requested Microsoft Entra ID administrator Resource state.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return azure Active Directory administrator on successful completion of {@link Mono}.
+ * @return Microsoft Entra ID administrator on successful completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Mono createOrUpdateAsync(String resourceGroupName, String serverName,
AdministratorName administratorName, ServerAzureADAdministratorInner parameters);
/**
- * Creates or updates an existing Azure Active Directory administrator.
+ * Creates or updates an existing Microsoft Entra ID administrator.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
* @param administratorName The name of server active directory administrator.
- * @param parameters The requested Azure Active Directory administrator Resource state.
+ * @param parameters The requested Microsoft Entra ID administrator Resource state.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return azure Active Directory administrator.
+ * @return Microsoft Entra ID administrator.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
ServerAzureADAdministratorInner createOrUpdate(String resourceGroupName, String serverName,
AdministratorName administratorName, ServerAzureADAdministratorInner parameters);
/**
- * Creates or updates an existing Azure Active Directory administrator.
+ * Creates or updates an existing Microsoft Entra ID administrator.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
* @param administratorName The name of server active directory administrator.
- * @param parameters The requested Azure Active Directory administrator Resource state.
+ * @param parameters The requested Microsoft Entra ID administrator Resource state.
* @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 azure Active Directory administrator.
+ * @return Microsoft Entra ID administrator.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
ServerAzureADAdministratorInner createOrUpdate(String resourceGroupName, String serverName,
AdministratorName administratorName, ServerAzureADAdministratorInner parameters, Context context);
/**
- * Deletes the Azure Active Directory administrator with the given name.
+ * Deletes the Microsoft Entra ID administrator with the given name.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
@@ -219,7 +219,7 @@ Mono>> deleteWithResponseAsync(String resourceGroupNam
AdministratorName administratorName);
/**
- * Deletes the Azure Active Directory administrator with the given name.
+ * Deletes the Microsoft Entra ID administrator with the given name.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
@@ -234,7 +234,7 @@ PollerFlux, Void> beginDeleteAsync(String resourceGroupName, St
AdministratorName administratorName);
/**
- * Deletes the Azure Active Directory administrator with the given name.
+ * Deletes the Microsoft Entra ID administrator with the given name.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
@@ -249,7 +249,7 @@ SyncPoller, Void> beginDelete(String resourceGroupName, String
AdministratorName administratorName);
/**
- * Deletes the Azure Active Directory administrator with the given name.
+ * Deletes the Microsoft Entra ID administrator with the given name.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
@@ -265,7 +265,7 @@ SyncPoller, Void> beginDelete(String resourceGroupName, String
AdministratorName administratorName, Context context);
/**
- * Deletes the Azure Active Directory administrator with the given name.
+ * Deletes the Microsoft Entra ID administrator with the given name.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
@@ -279,7 +279,7 @@ SyncPoller, Void> beginDelete(String resourceGroupName, String
Mono deleteAsync(String resourceGroupName, String serverName, AdministratorName administratorName);
/**
- * Deletes the Azure Active Directory administrator with the given name.
+ * Deletes the Microsoft Entra ID administrator with the given name.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
@@ -292,7 +292,7 @@ SyncPoller, Void> beginDelete(String resourceGroupName, String
void delete(String resourceGroupName, String serverName, AdministratorName administratorName);
/**
- * Deletes the Azure Active Directory administrator with the given name.
+ * Deletes the Microsoft Entra ID administrator with the given name.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
@@ -306,34 +306,34 @@ SyncPoller, Void> beginDelete(String resourceGroupName, String
void delete(String resourceGroupName, String serverName, AdministratorName administratorName, Context context);
/**
- * Gets a list of Azure Active Directory administrators in a server.
+ * Gets a list of Microsoft Entra ID administrators in a server.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 list of Azure Active Directory administrators in a server as paginated response with {@link PagedFlux}.
+ * @return a list of Microsoft Entra ID administrators in a server as paginated response with {@link PagedFlux}.
*/
@ServiceMethod(returns = ReturnType.COLLECTION)
PagedFlux listByServerAsync(String resourceGroupName, String serverName);
/**
- * Gets a list of Azure Active Directory administrators in a server.
+ * Gets a list of Microsoft Entra ID administrators in a server.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 list of Azure Active Directory administrators in a server as paginated response with
+ * @return a list of Microsoft Entra ID administrators in a server as paginated response with
* {@link PagedIterable}.
*/
@ServiceMethod(returns = ReturnType.COLLECTION)
PagedIterable listByServer(String resourceGroupName, String serverName);
/**
- * Gets a list of Azure Active Directory administrators in a server.
+ * Gets a list of Microsoft Entra ID administrators in a server.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
@@ -341,7 +341,7 @@ SyncPoller, Void> beginDelete(String resourceGroupName, String
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 list of Azure Active Directory administrators in a server as paginated response with
+ * @return a list of Microsoft Entra ID administrators in a server as paginated response with
* {@link PagedIterable}.
*/
@ServiceMethod(returns = ReturnType.COLLECTION)
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/ServerAzureADOnlyAuthenticationsClient.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/ServerAzureADOnlyAuthenticationsClient.java
index a8b36ed26cc1..d80fef943b23 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/ServerAzureADOnlyAuthenticationsClient.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/ServerAzureADOnlyAuthenticationsClient.java
@@ -24,15 +24,15 @@
*/
public interface ServerAzureADOnlyAuthenticationsClient {
/**
- * Gets a specific Azure Active Directory only authentication property.
+ * Gets a specific Microsoft Entra ID-only authentication property.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 specific Azure Active Directory only authentication property along with {@link Response} on successful
+ * @return a specific Microsoft Entra ID-only authentication property along with {@link Response} on successful
* completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
@@ -40,46 +40,46 @@ Mono> getWithResponseAsync(String
String serverName, AuthenticationName authenticationName);
/**
- * Gets a specific Azure Active Directory only authentication property.
+ * Gets a specific Microsoft Entra ID-only authentication property.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 specific Azure Active Directory only authentication property on successful completion of {@link Mono}.
+ * @return a specific Microsoft Entra ID-only authentication property on successful completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Mono getAsync(String resourceGroupName, String serverName,
AuthenticationName authenticationName);
/**
- * Gets a specific Azure Active Directory only authentication property.
+ * Gets a specific Microsoft Entra ID-only authentication property.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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 specific Azure Active Directory only authentication property along with {@link Response}.
+ * @return a specific Microsoft Entra ID-only authentication property along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Response getWithResponse(String resourceGroupName, String serverName,
AuthenticationName authenticationName, Context context);
/**
- * Gets a specific Azure Active Directory only authentication property.
+ * Gets a specific Microsoft Entra ID-only authentication property.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 specific Azure Active Directory only authentication property.
+ * @return a specific Microsoft Entra ID-only authentication property.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
ServerAzureADOnlyAuthenticationInner get(String resourceGroupName, String serverName,
@@ -91,13 +91,13 @@ ServerAzureADOnlyAuthenticationInner get(String resourceGroupName, String server
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return azure Active Directory only authentication along with {@link Response} on successful completion of
+ * @return Microsoft Entra ID-only authentication along with {@link Response} on successful completion of
* {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
@@ -110,13 +110,13 @@ Mono>> createOrUpdateWithResponseAsync(String resource
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 PollerFlux} for polling of azure Active Directory only authentication.
+ * @return the {@link PollerFlux} for polling of Microsoft Entra ID-only authentication.
*/
@ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
PollerFlux, ServerAzureADOnlyAuthenticationInner>
@@ -129,13 +129,13 @@ Mono>> createOrUpdateWithResponseAsync(String resource
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 SyncPoller} for polling of azure Active Directory only authentication.
+ * @return the {@link SyncPoller} for polling of Microsoft Entra ID-only authentication.
*/
@ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, ServerAzureADOnlyAuthenticationInner>
@@ -148,14 +148,14 @@ Mono>> createOrUpdateWithResponseAsync(String resource
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @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 SyncPoller} for polling of azure Active Directory only authentication.
+ * @return the {@link SyncPoller} for polling of Microsoft Entra ID-only authentication.
*/
@ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, ServerAzureADOnlyAuthenticationInner>
@@ -168,13 +168,13 @@ Mono>> createOrUpdateWithResponseAsync(String resource
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return azure Active Directory only authentication on successful completion of {@link Mono}.
+ * @return Microsoft Entra ID-only authentication on successful completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Mono createOrUpdateAsync(String resourceGroupName, String serverName,
@@ -186,13 +186,13 @@ Mono createOrUpdateAsync(String resourceGr
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
- * @return azure Active Directory only authentication.
+ * @return Microsoft Entra ID-only authentication.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
ServerAzureADOnlyAuthenticationInner createOrUpdate(String resourceGroupName, String serverName,
@@ -204,14 +204,14 @@ ServerAzureADOnlyAuthenticationInner createOrUpdate(String resourceGroupName, St
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @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 azure Active Directory only authentication.
+ * @return Microsoft Entra ID-only authentication.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
ServerAzureADOnlyAuthenticationInner createOrUpdate(String resourceGroupName, String serverName,
@@ -222,7 +222,7 @@ ServerAzureADOnlyAuthenticationInner createOrUpdate(String resourceGroupName, St
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -237,7 +237,7 @@ Mono>> deleteWithResponseAsync(String resourceGroupNam
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -252,7 +252,7 @@ PollerFlux, Void> beginDeleteAsync(String resourceGroupName, St
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -267,7 +267,7 @@ SyncPoller, Void> beginDelete(String resourceGroupName, String
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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.
@@ -283,7 +283,7 @@ SyncPoller, Void> beginDelete(String resourceGroupName, String
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -297,7 +297,7 @@ SyncPoller, Void> beginDelete(String resourceGroupName, String
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -310,7 +310,7 @@ SyncPoller, Void> beginDelete(String resourceGroupName, String
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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.
@@ -320,35 +320,35 @@ SyncPoller, Void> beginDelete(String resourceGroupName, String
void delete(String resourceGroupName, String serverName, AuthenticationName authenticationName, Context context);
/**
- * Gets a list of server Azure Active Directory only authentications.
+ * Gets a list of server Microsoft Entra ID-only authentications.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 list of server Azure Active Directory only authentications as paginated response with
+ * @return a list of server Microsoft Entra ID-only authentications as paginated response with
* {@link PagedFlux}.
*/
@ServiceMethod(returns = ReturnType.COLLECTION)
PagedFlux listByServerAsync(String resourceGroupName, String serverName);
/**
- * Gets a list of server Azure Active Directory only authentications.
+ * Gets a list of server Microsoft Entra ID-only authentications.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 list of server Azure Active Directory only authentications as paginated response with
+ * @return a list of server Microsoft Entra ID-only authentications as paginated response with
* {@link PagedIterable}.
*/
@ServiceMethod(returns = ReturnType.COLLECTION)
PagedIterable listByServer(String resourceGroupName, String serverName);
/**
- * Gets a list of server Azure Active Directory only authentications.
+ * Gets a list of server Microsoft Entra ID-only authentications.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
@@ -356,7 +356,7 @@ SyncPoller, Void> beginDelete(String resourceGroupName, String
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.core.management.exception.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 list of server Azure Active Directory only authentications as paginated response with
+ * @return a list of server Microsoft Entra ID-only authentications as paginated response with
* {@link PagedIterable}.
*/
@ServiceMethod(returns = ReturnType.COLLECTION)
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/AdministratorProperties.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/AdministratorProperties.java
index 91c15eef7d2a..38efbec4d1f2 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/AdministratorProperties.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/AdministratorProperties.java
@@ -41,7 +41,7 @@ public final class AdministratorProperties implements JsonSerializable {
/*
- * Azure Active Directory only Authentication enabled.
+ * Microsoft Entra ID only Authentication enabled.
*/
private boolean azureADOnlyAuthentication;
@@ -28,7 +28,7 @@ public AzureADOnlyAuthProperties() {
}
/**
- * Get the azureADOnlyAuthentication property: Azure Active Directory only Authentication enabled.
+ * Get the azureADOnlyAuthentication property: Microsoft Entra ID only Authentication enabled.
*
* @return the azureADOnlyAuthentication value.
*/
@@ -37,7 +37,7 @@ public boolean azureADOnlyAuthentication() {
}
/**
- * Set the azureADOnlyAuthentication property: Azure Active Directory only Authentication enabled.
+ * Set the azureADOnlyAuthentication property: Microsoft Entra ID only Authentication enabled.
*
* @param azureADOnlyAuthentication the azureADOnlyAuthentication value to set.
* @return the AzureADOnlyAuthProperties object itself.
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/DatabaseBlobAuditingPolicyInner.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/DatabaseBlobAuditingPolicyInner.java
index 3affc560e7a4..1f168e462fac 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/DatabaseBlobAuditingPolicyInner.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/DatabaseBlobAuditingPolicyInner.java
@@ -478,7 +478,7 @@ public DatabaseBlobAuditingPolicyInner withStorageEndpoint(String storageEndpoin
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
@@ -495,7 +495,7 @@ public String storageAccountAccessKey() {
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/DatabaseBlobAuditingPolicyProperties.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/DatabaseBlobAuditingPolicyProperties.java
index 4e392c067cee..b9a21d265b08 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/DatabaseBlobAuditingPolicyProperties.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/DatabaseBlobAuditingPolicyProperties.java
@@ -156,7 +156,7 @@ public final class DatabaseBlobAuditingPolicyProperties
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
@@ -516,7 +516,7 @@ public DatabaseBlobAuditingPolicyProperties withStorageEndpoint(String storageEn
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
@@ -533,7 +533,7 @@ public String storageAccountAccessKey() {
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/DatabaseInner.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/DatabaseInner.java
index 4790fcf50aa5..c66fa584ee1f 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/DatabaseInner.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/DatabaseInner.java
@@ -67,7 +67,7 @@ public final class DatabaseInner extends Resource {
private String managedBy;
/*
- * The Azure Active Directory identity of the database.
+ * The Microsoft Entra ID identity of the database.
*/
private DatabaseIdentity identity;
@@ -169,7 +169,7 @@ public String managedBy() {
}
/**
- * Get the identity property: The Azure Active Directory identity of the database.
+ * Get the identity property: The Microsoft Entra ID identity of the database.
*
* @return the identity value.
*/
@@ -178,7 +178,7 @@ public DatabaseIdentity identity() {
}
/**
- * Set the identity property: The Azure Active Directory identity of the database.
+ * Set the identity property: The Microsoft Entra ID identity of the database.
*
* @param identity the identity value to set.
* @return the DatabaseInner object itself.
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ExtendedDatabaseBlobAuditingPolicyInner.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ExtendedDatabaseBlobAuditingPolicyInner.java
index e69a0b62a6ea..11fddfbc0bf3 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ExtendedDatabaseBlobAuditingPolicyInner.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ExtendedDatabaseBlobAuditingPolicyInner.java
@@ -488,7 +488,7 @@ public ExtendedDatabaseBlobAuditingPolicyInner withStorageEndpoint(String storag
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
@@ -505,7 +505,7 @@ public String storageAccountAccessKey() {
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ExtendedDatabaseBlobAuditingPolicyProperties.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ExtendedDatabaseBlobAuditingPolicyProperties.java
index a0a45361dffb..6c756f963e55 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ExtendedDatabaseBlobAuditingPolicyProperties.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ExtendedDatabaseBlobAuditingPolicyProperties.java
@@ -161,7 +161,7 @@ public final class ExtendedDatabaseBlobAuditingPolicyProperties
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
@@ -543,7 +543,7 @@ public ExtendedDatabaseBlobAuditingPolicyProperties withStorageEndpoint(String s
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
@@ -560,7 +560,7 @@ public String storageAccountAccessKey() {
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ExtendedServerBlobAuditingPolicyInner.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ExtendedServerBlobAuditingPolicyInner.java
index 3c043b553a66..5f861836c5c9 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ExtendedServerBlobAuditingPolicyInner.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ExtendedServerBlobAuditingPolicyInner.java
@@ -536,7 +536,7 @@ public ExtendedServerBlobAuditingPolicyInner withStorageEndpoint(String storageE
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
@@ -553,7 +553,7 @@ public String storageAccountAccessKey() {
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ExtendedServerBlobAuditingPolicyProperties.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ExtendedServerBlobAuditingPolicyProperties.java
index e366b0da9e29..b8d28bd4655f 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ExtendedServerBlobAuditingPolicyProperties.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ExtendedServerBlobAuditingPolicyProperties.java
@@ -180,7 +180,7 @@ public final class ExtendedServerBlobAuditingPolicyProperties
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
@@ -608,7 +608,7 @@ public ExtendedServerBlobAuditingPolicyProperties withStorageEndpoint(String sto
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
@@ -625,7 +625,7 @@ public String storageAccountAccessKey() {
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ManagedInstanceAzureADOnlyAuthProperties.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ManagedInstanceAzureADOnlyAuthProperties.java
index f9339d4dcd15..a6bcae88050d 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ManagedInstanceAzureADOnlyAuthProperties.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ManagedInstanceAzureADOnlyAuthProperties.java
@@ -18,7 +18,7 @@
public final class ManagedInstanceAzureADOnlyAuthProperties
implements JsonSerializable {
/*
- * Azure Active Directory only Authentication enabled.
+ * Microsoft Entra ID only Authentication enabled.
*/
private boolean azureADOnlyAuthentication;
@@ -29,7 +29,7 @@ public ManagedInstanceAzureADOnlyAuthProperties() {
}
/**
- * Get the azureADOnlyAuthentication property: Azure Active Directory only Authentication enabled.
+ * Get the azureADOnlyAuthentication property: Microsoft Entra ID only Authentication enabled.
*
* @return the azureADOnlyAuthentication value.
*/
@@ -38,7 +38,7 @@ public boolean azureADOnlyAuthentication() {
}
/**
- * Set the azureADOnlyAuthentication property: Azure Active Directory only Authentication enabled.
+ * Set the azureADOnlyAuthentication property: Microsoft Entra ID only Authentication enabled.
*
* @param azureADOnlyAuthentication the azureADOnlyAuthentication value to set.
* @return the ManagedInstanceAzureADOnlyAuthProperties object itself.
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ManagedInstanceAzureADOnlyAuthenticationInner.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ManagedInstanceAzureADOnlyAuthenticationInner.java
index 08a64637dd60..6eaceec67f9c 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ManagedInstanceAzureADOnlyAuthenticationInner.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ManagedInstanceAzureADOnlyAuthenticationInner.java
@@ -13,7 +13,7 @@
import java.io.IOException;
/**
- * Azure Active Directory only authentication.
+ * Microsoft Entra ID only authentication.
*/
@Fluent
public final class ManagedInstanceAzureADOnlyAuthenticationInner extends ProxyResource {
@@ -97,7 +97,7 @@ public String id() {
}
/**
- * Get the azureADOnlyAuthentication property: Azure Active Directory only Authentication enabled.
+ * Get the azureADOnlyAuthentication property: Microsoft Entra ID only Authentication enabled.
*
* @return the azureADOnlyAuthentication value.
*/
@@ -106,7 +106,7 @@ public Boolean azureADOnlyAuthentication() {
}
/**
- * Set the azureADOnlyAuthentication property: Azure Active Directory only Authentication enabled.
+ * Set the azureADOnlyAuthentication property: Microsoft Entra ID only Authentication enabled.
*
* @param azureADOnlyAuthentication the azureADOnlyAuthentication value to set.
* @return the ManagedInstanceAzureADOnlyAuthenticationInner object itself.
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ManagedInstanceInner.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ManagedInstanceInner.java
index 3d840a871b98..ccb910adaf2f 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ManagedInstanceInner.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ManagedInstanceInner.java
@@ -43,7 +43,7 @@ public final class ManagedInstanceInner extends Resource {
private ManagedInstanceProperties innerProperties;
/*
- * The Azure Active Directory identity of the managed instance.
+ * The Microsoft Entra ID identity of the managed instance.
*/
private ResourceIdentity identity;
@@ -91,7 +91,7 @@ private ManagedInstanceProperties innerProperties() {
}
/**
- * Get the identity property: The Azure Active Directory identity of the managed instance.
+ * Get the identity property: The Microsoft Entra ID identity of the managed instance.
*
* @return the identity value.
*/
@@ -100,7 +100,7 @@ public ResourceIdentity identity() {
}
/**
- * Set the identity property: The Azure Active Directory identity of the managed instance.
+ * Set the identity property: The Microsoft Entra ID identity of the managed instance.
*
* @param identity the identity value to set.
* @return the ManagedInstanceInner object itself.
@@ -914,7 +914,7 @@ public ManagedInstanceInner withKeyId(String keyId) {
}
/**
- * Get the administrators property: The Azure Active Directory administrator can be utilized during instance
+ * Get the administrators property: The Microsoft Entra ID administrator can be utilized during instance
* creation and for instance updates, except for the azureADOnlyAuthentication property. To update the
* azureADOnlyAuthentication property, individual API must be used.
*
@@ -925,7 +925,7 @@ public ManagedInstanceExternalAdministrator administrators() {
}
/**
- * Set the administrators property: The Azure Active Directory administrator can be utilized during instance
+ * Set the administrators property: The Microsoft Entra ID administrator can be utilized during instance
* creation and for instance updates, except for the azureADOnlyAuthentication property. To update the
* azureADOnlyAuthentication property, individual API must be used.
*
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ManagedInstanceProperties.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ManagedInstanceProperties.java
index ba1d3af0dd7f..35b5e033c194 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ManagedInstanceProperties.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ManagedInstanceProperties.java
@@ -224,7 +224,7 @@ public final class ManagedInstanceProperties implements JsonSerializable {
/*
- * The type of service accessed by the managed instance service, e.g., Azure Storage, Azure Active Directory, etc.
+ * The type of service accessed by the managed instance service, e.g., Azure Storage, Microsoft Entra ID, etc.
*/
private String category;
@@ -36,7 +36,7 @@ private OutboundEnvironmentEndpointInner() {
/**
* Get the category property: The type of service accessed by the managed instance service, e.g., Azure Storage,
- * Azure Active Directory, etc.
+ * Microsoft Entra ID, etc.
*
* @return the category value.
*/
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerAzureADAdministratorInner.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerAzureADAdministratorInner.java
index 5416a60b5c96..849cf937549b 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerAzureADAdministratorInner.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerAzureADAdministratorInner.java
@@ -15,7 +15,7 @@
import java.util.UUID;
/**
- * Azure Active Directory administrator.
+ * Microsoft Entra ID administrator.
*/
@Fluent
public final class ServerAzureADAdministratorInner extends ProxyResource {
@@ -191,7 +191,7 @@ public ServerAzureADAdministratorInner withTenantId(UUID tenantId) {
}
/**
- * Get the azureADOnlyAuthentication property: Azure Active Directory only Authentication enabled.
+ * Get the azureADOnlyAuthentication property: Microsoft Entra ID only Authentication enabled.
*
* @return the azureADOnlyAuthentication value.
*/
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerAzureADOnlyAuthenticationInner.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerAzureADOnlyAuthenticationInner.java
index 99f8b2f19d2b..53de809a9f17 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerAzureADOnlyAuthenticationInner.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerAzureADOnlyAuthenticationInner.java
@@ -13,7 +13,7 @@
import java.io.IOException;
/**
- * Azure Active Directory only authentication.
+ * Microsoft Entra ID only authentication.
*/
@Fluent
public final class ServerAzureADOnlyAuthenticationInner extends ProxyResource {
@@ -97,7 +97,7 @@ public String id() {
}
/**
- * Get the azureADOnlyAuthentication property: Azure Active Directory only Authentication enabled.
+ * Get the azureADOnlyAuthentication property: Microsoft Entra ID only Authentication enabled.
*
* @return the azureADOnlyAuthentication value.
*/
@@ -106,7 +106,7 @@ public Boolean azureADOnlyAuthentication() {
}
/**
- * Set the azureADOnlyAuthentication property: Azure Active Directory only Authentication enabled.
+ * Set the azureADOnlyAuthentication property: Microsoft Entra ID only Authentication enabled.
*
* @param azureADOnlyAuthentication the azureADOnlyAuthentication value to set.
* @return the ServerAzureADOnlyAuthenticationInner object itself.
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerBlobAuditingPolicyInner.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerBlobAuditingPolicyInner.java
index 1b5e525e8cf1..8be15484c072 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerBlobAuditingPolicyInner.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerBlobAuditingPolicyInner.java
@@ -513,7 +513,7 @@ public ServerBlobAuditingPolicyInner withStorageEndpoint(String storageEndpoint)
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
@@ -530,7 +530,7 @@ public String storageAccountAccessKey() {
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerBlobAuditingPolicyProperties.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerBlobAuditingPolicyProperties.java
index 3423775fc5cc..73121e459f35 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerBlobAuditingPolicyProperties.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerBlobAuditingPolicyProperties.java
@@ -174,7 +174,7 @@ public final class ServerBlobAuditingPolicyProperties implements JsonSerializabl
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
@@ -580,7 +580,7 @@ public ServerBlobAuditingPolicyProperties withStorageEndpoint(String storageEndp
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
@@ -597,7 +597,7 @@ public String storageAccountAccessKey() {
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerDevOpsAuditSettingsProperties.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerDevOpsAuditSettingsProperties.java
index fc07a3786193..be886081a127 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerDevOpsAuditSettingsProperties.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerDevOpsAuditSettingsProperties.java
@@ -62,7 +62,7 @@ public final class ServerDevOpsAuditSettingsProperties
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
@@ -196,7 +196,7 @@ public ServerDevOpsAuditSettingsProperties withStorageEndpoint(String storageEnd
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
@@ -213,7 +213,7 @@ public String storageAccountAccessKey() {
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerDevOpsAuditingSettingsInner.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerDevOpsAuditingSettingsInner.java
index 91dcae83883e..9697098ffdfc 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerDevOpsAuditingSettingsInner.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerDevOpsAuditingSettingsInner.java
@@ -225,7 +225,7 @@ public ServerDevOpsAuditingSettingsInner withStorageEndpoint(String storageEndpo
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
@@ -242,7 +242,7 @@ public String storageAccountAccessKey() {
* If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL
* server system-assigned managed identity to access the storage.
* Prerequisites for using managed identity authentication:
- * 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ * 1. Assign SQL Server a system-assigned managed identity in Microsoft Entra ID (AAD).
* 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to
* the server identity.
* For more information, see [Auditing to storage using Managed Identity
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerInner.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerInner.java
index 533d312f76e9..6a5f812ddaff 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerInner.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerInner.java
@@ -33,7 +33,7 @@ public final class ServerInner extends Resource {
private ServerProperties innerProperties;
/*
- * The Azure Active Directory identity of the server.
+ * The Microsoft Entra ID identity of the server.
*/
private ResourceIdentity identity;
@@ -78,7 +78,7 @@ private ServerProperties innerProperties() {
}
/**
- * Get the identity property: The Azure Active Directory identity of the server.
+ * Get the identity property: The Microsoft Entra ID identity of the server.
*
* @return the identity value.
*/
@@ -87,7 +87,7 @@ public ResourceIdentity identity() {
}
/**
- * Set the identity property: The Azure Active Directory identity of the server.
+ * Set the identity property: The Microsoft Entra ID identity of the server.
*
* @param identity the identity value to set.
* @return the ServerInner object itself.
@@ -389,7 +389,7 @@ public ServerInner withKeyId(String keyId) {
}
/**
- * Get the administrators property: The Azure Active Directory administrator can be utilized during server creation
+ * Get the administrators property: The Microsoft Entra ID administrator can be utilized during server creation
* and for server updates, except for the azureADOnlyAuthentication property. To update the
* azureADOnlyAuthentication property, individual API must be used.
*
@@ -400,7 +400,7 @@ public ServerExternalAdministrator administrators() {
}
/**
- * Set the administrators property: The Azure Active Directory administrator can be utilized during server creation
+ * Set the administrators property: The Microsoft Entra ID administrator can be utilized during server creation
* and for server updates, except for the azureADOnlyAuthentication property. To update the
* azureADOnlyAuthentication property, individual API must be used.
*
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerProperties.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerProperties.java
index 715e8f59dbf9..8f372e6e9ec0 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerProperties.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/fluent/models/ServerProperties.java
@@ -87,7 +87,7 @@ public final class ServerProperties implements JsonSerializable> listByInstanceNext(
}
/**
- * Gets a specific Azure Active Directory only authentication property.
+ * Gets a specific Microsoft Entra ID-only authentication property.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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 specific Azure Active Directory only authentication property along with {@link Response} on successful
+ * @return a specific Microsoft Entra ID-only authentication property along with {@link Response} on successful
* completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
@@ -168,16 +168,16 @@ public Mono> getWithResp
}
/**
- * Gets a specific Azure Active Directory only authentication property.
+ * Gets a specific Microsoft Entra ID-only authentication property.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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 specific Azure Active Directory only authentication property along with {@link Response} on successful
+ * @return a specific Microsoft Entra ID-only authentication property along with {@link Response} on successful
* completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
@@ -210,15 +210,15 @@ private Mono> getWithRes
}
/**
- * Gets a specific Azure Active Directory only authentication property.
+ * Gets a specific Microsoft Entra ID-only authentication property.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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 specific Azure Active Directory only authentication property on successful completion of {@link Mono}.
+ * @return a specific Microsoft Entra ID-only authentication property on successful completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
public Mono getAsync(String resourceGroupName,
@@ -228,16 +228,16 @@ public Mono getAsync(String resou
}
/**
- * Gets a specific Azure Active Directory only authentication property.
+ * Gets a specific Microsoft Entra ID-only authentication property.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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 specific Azure Active Directory only authentication property along with {@link Response}.
+ * @return a specific Microsoft Entra ID-only authentication property along with {@link Response}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
public Response getWithResponse(String resourceGroupName,
@@ -246,15 +246,15 @@ public Response getWithResponse(S
}
/**
- * Gets a specific Azure Active Directory only authentication property.
+ * Gets a specific Microsoft Entra ID-only authentication property.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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 specific Azure Active Directory only authentication property.
+ * @return a specific Microsoft Entra ID-only authentication property.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
public ManagedInstanceAzureADOnlyAuthenticationInner get(String resourceGroupName, String managedInstanceName,
@@ -268,13 +268,13 @@ public ManagedInstanceAzureADOnlyAuthenticationInner get(String resourceGroupNam
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @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 azure Active Directory only authentication along with {@link Response} on successful completion of
+ * @return Microsoft Entra ID-only authentication along with {@link Response} on successful completion of
* {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
@@ -321,14 +321,14 @@ public Mono>> createOrUpdateWithResponseAsync(String r
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @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 azure Active Directory only authentication along with {@link Response} on successful completion of
+ * @return Microsoft Entra ID-only authentication along with {@link Response} on successful completion of
* {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
@@ -374,13 +374,13 @@ private Mono>> createOrUpdateWithResponseAsync(String
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @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 PollerFlux} for polling of azure Active Directory only authentication.
+ * @return the {@link PollerFlux} for polling of Microsoft Entra ID-only authentication.
*/
@ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public
@@ -401,14 +401,14 @@ private Mono>> createOrUpdateWithResponseAsync(String
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @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 PollerFlux} for polling of azure Active Directory only authentication.
+ * @return the {@link PollerFlux} for polling of Microsoft Entra ID-only authentication.
*/
@ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private
@@ -431,13 +431,13 @@ private Mono>> createOrUpdateWithResponseAsync(String
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @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 SyncPoller} for polling of azure Active Directory only authentication.
+ * @return the {@link SyncPoller} for polling of Microsoft Entra ID-only authentication.
*/
@ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public
@@ -454,14 +454,14 @@ private Mono>> createOrUpdateWithResponseAsync(String
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @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 SyncPoller} for polling of azure Active Directory only authentication.
+ * @return the {@link SyncPoller} for polling of Microsoft Entra ID-only authentication.
*/
@ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public
@@ -479,13 +479,13 @@ private Mono>> createOrUpdateWithResponseAsync(String
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @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 azure Active Directory only authentication on successful completion of {@link Mono}.
+ * @return Microsoft Entra ID-only authentication on successful completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
public Mono createOrUpdateAsync(String resourceGroupName,
@@ -501,14 +501,14 @@ public Mono createOrUpdateAsync(S
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @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 azure Active Directory only authentication on successful completion of {@link Mono}.
+ * @return Microsoft Entra ID-only authentication on successful completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
private Mono createOrUpdateAsync(String resourceGroupName,
@@ -525,13 +525,13 @@ private Mono createOrUpdateAsync(
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @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 azure Active Directory only authentication.
+ * @return Microsoft Entra ID-only authentication.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
public ManagedInstanceAzureADOnlyAuthenticationInner createOrUpdate(String resourceGroupName,
@@ -546,14 +546,14 @@ public ManagedInstanceAzureADOnlyAuthenticationInner createOrUpdate(String resou
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @param parameters The required parameters for creating or updating an Active Directory only authentication
* property.
* @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 azure Active Directory only authentication.
+ * @return Microsoft Entra ID-only authentication.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
public ManagedInstanceAzureADOnlyAuthenticationInner createOrUpdate(String resourceGroupName,
@@ -568,7 +568,7 @@ public ManagedInstanceAzureADOnlyAuthenticationInner createOrUpdate(String resou
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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.
@@ -608,7 +608,7 @@ public Mono>> deleteWithResponseAsync(String resourceG
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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.
@@ -648,7 +648,7 @@ private Mono>> deleteWithResponseAsync(String resource
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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.
@@ -668,7 +668,7 @@ public PollerFlux, Void> beginDeleteAsync(String resourceGroupN
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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.
@@ -690,7 +690,7 @@ private PollerFlux, Void> beginDeleteAsync(String resourceGroup
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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.
@@ -707,7 +707,7 @@ public SyncPoller, Void> beginDelete(String resourceGroupName,
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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.
@@ -726,7 +726,7 @@ public SyncPoller, Void> beginDelete(String resourceGroupName,
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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.
@@ -744,7 +744,7 @@ public Mono deleteAsync(String resourceGroupName, String managedInstanceNa
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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.
@@ -763,7 +763,7 @@ private Mono deleteAsync(String resourceGroupName, String managedInstanceN
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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.
@@ -778,7 +778,7 @@ public void delete(String resourceGroupName, String managedInstanceName, Authent
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
- * @param authenticationName The name of server azure active directory only authentication.
+ * @param authenticationName The name of server Microsoft Entra ID-only authentication.
* @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.
@@ -791,14 +791,14 @@ public void delete(String resourceGroupName, String managedInstanceName, Authent
}
/**
- * Gets a list of server Azure Active Directory only authentications.
+ * Gets a list of server Microsoft Entra ID-only authentications.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
* @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 list of server Azure Active Directory only authentications along with {@link PagedResponse} on
+ * @return a list of server Microsoft Entra ID-only authentications along with {@link PagedResponse} on
* successful completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
@@ -831,7 +831,7 @@ public void delete(String resourceGroupName, String managedInstanceName, Authent
}
/**
- * Gets a list of server Azure Active Directory only authentications.
+ * Gets a list of server Microsoft Entra ID-only authentications.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
@@ -839,7 +839,7 @@ public void delete(String resourceGroupName, String managedInstanceName, Authent
* @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 list of server Azure Active Directory only authentications along with {@link PagedResponse} on
+ * @return a list of server Microsoft Entra ID-only authentications along with {@link PagedResponse} on
* successful completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
@@ -871,14 +871,14 @@ public void delete(String resourceGroupName, String managedInstanceName, Authent
}
/**
- * Gets a list of server Azure Active Directory only authentications.
+ * Gets a list of server Microsoft Entra ID-only authentications.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
* @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 list of server Azure Active Directory only authentications as paginated response with
+ * @return a list of server Microsoft Entra ID-only authentications as paginated response with
* {@link PagedFlux}.
*/
@ServiceMethod(returns = ReturnType.COLLECTION)
@@ -889,7 +889,7 @@ public PagedFlux listByInstanceAs
}
/**
- * Gets a list of server Azure Active Directory only authentications.
+ * Gets a list of server Microsoft Entra ID-only authentications.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
@@ -897,7 +897,7 @@ public PagedFlux listByInstanceAs
* @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 list of server Azure Active Directory only authentications as paginated response with
+ * @return a list of server Microsoft Entra ID-only authentications as paginated response with
* {@link PagedFlux}.
*/
@ServiceMethod(returns = ReturnType.COLLECTION)
@@ -908,14 +908,14 @@ private PagedFlux listByInstanceA
}
/**
- * Gets a list of server Azure Active Directory only authentications.
+ * Gets a list of server Microsoft Entra ID-only authentications.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
* @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 list of server Azure Active Directory only authentications as paginated response with
+ * @return a list of server Microsoft Entra ID-only authentications as paginated response with
* {@link PagedIterable}.
*/
@ServiceMethod(returns = ReturnType.COLLECTION)
@@ -925,7 +925,7 @@ public PagedIterable listByInstan
}
/**
- * Gets a list of server Azure Active Directory only authentications.
+ * Gets a list of server Microsoft Entra ID-only authentications.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param managedInstanceName The name of the managed instance.
@@ -933,7 +933,7 @@ public PagedIterable listByInstan
* @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 list of server Azure Active Directory only authentications as paginated response with
+ * @return a list of server Microsoft Entra ID-only authentications as paginated response with
* {@link PagedIterable}.
*/
@ServiceMethod(returns = ReturnType.COLLECTION)
@@ -949,7 +949,7 @@ public PagedIterable listByInstan
* @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 list of server Azure Active Directory only authentications along with {@link PagedResponse} on
+ * @return a list of server Microsoft Entra ID-only authentications along with {@link PagedResponse} on
* successful completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
@@ -979,7 +979,7 @@ public PagedIterable listByInstan
* @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 list of server Azure Active Directory only authentications along with {@link PagedResponse} on
+ * @return a list of server Microsoft Entra ID-only authentications along with {@link PagedResponse} on
* successful completion of {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/implementation/ServerAzureADAdministratorsClientImpl.java b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/implementation/ServerAzureADAdministratorsClientImpl.java
index 5a7cdfe3d564..5cae8f30f65b 100644
--- a/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/implementation/ServerAzureADAdministratorsClientImpl.java
+++ b/sdk/sql/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/implementation/ServerAzureADAdministratorsClientImpl.java
@@ -119,7 +119,7 @@ Mono> listByServerNext(
}
/**
- * Gets a Azure Active Directory administrator.
+ * Gets a Microsoft Entra ID administrator.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
@@ -127,7 +127,7 @@ Mono> listByServerNext(
* @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 Azure Active Directory administrator along with {@link Response} on successful completion of
+ * @return a Microsoft Entra ID administrator along with {@link Response} on successful completion of
* {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
@@ -160,7 +160,7 @@ public Mono> getWithResponseAsync(Stri
}
/**
- * Gets a Azure Active Directory administrator.
+ * Gets a Microsoft Entra ID administrator.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
@@ -169,7 +169,7 @@ public Mono> getWithResponseAsync(Stri
* @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 Azure Active Directory administrator along with {@link Response} on successful completion of
+ * @return a Microsoft Entra ID administrator along with {@link Response} on successful completion of
* {@link Mono}.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
@@ -201,7 +201,7 @@ private Mono> getWithResponseAsync(Str
}
/**
- * Gets a Azure Active Directory administrator.
+ * Gets a Microsoft Entra ID administrator.
*
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param serverName The name of the server.
@@ -209,7 +209,7 @@ private Mono