Update TRC in Azure Core

sdk/core/azure-core-experimental/CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Features Added
 
 ### Breaking Changes
+- Removed `TokenRequestContenxtExperimental` class that allows to configure TenantId Challenges.
 
 ### Bugs Fixed
 

sdk/core/azure-core-experimental/src/main/java/module-info.java

@@ -8,7 +8,6 @@
     exports com.azure.core.experimental.implementation;
     exports com.azure.core.experimental.http;
     exports com.azure.core.experimental.http.policy;
-    exports com.azure.core.experimental.credential;
 
     uses com.azure.core.experimental.serializer.AvroSerializerProvider;
 }

sdk/core/azure-core/CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 1.21.0-beta.1 (Unreleased)
 
 ### Features Added
+- Added `setTenantId` and `getTenantId` methods to `TokenRequestContext` class that allows to configure TenantId Challenges.
 
 ### Breaking Changes
 

sdk/core/azure-core/src/main/java/com/azure/core/credential/TokenRequestContext.java

@@ -14,6 +14,7 @@
 public class TokenRequestContext {
     private final List<String> scopes;
     private String claims;
+    private String tenantId;
 
     /**
      * Creates a token request instance.
@@ -77,4 +78,24 @@ public TokenRequestContext setClaims(String claims) {
     public String getClaims() {
         return this.claims;
     }
+
+    /**
+     * Set the tenant id to be used for the authentication request.
+     *
+     * @param tenantId the tenant to be used when requesting the token.
+     * @return the updated TokenRequestContext itself
+     */
+    public TokenRequestContext setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+        return this;
+    }
+
+    /**
+     * Get the tenant id to be used for the authentication request.
+     *
+     * @return the configured tenant id.
+     */
+    public String getTenantId() {
+        return this.tenantId;
+    }
 }

sdk/identity/azure-identity/pom.xml

@@ -31,12 +31,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-    <version>1.20.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
-    </dependency>
-    <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-core-experimental</artifactId>
-      <version>1.0.0-beta.18</version> <!-- {x-version-update;com.azure:azure-core-experimental;dependency} -->
+      <version>1.21.0-beta.1</version> <!-- {x-version-update;unreleased_com.azure:azure-core;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

sdk/identity/azure-identity/src/main/java/com/azure/identity/CredentialBuilderBase.java

@@ -92,7 +92,7 @@ public T httpClient(HttpClient client) {
 
     /**
      * Allows to override the tenant being used in the authentication request
-     * via {@link com.azure.core.experimental.credential.TokenRequestContextExperimental#setTenantId(String)}.
+     * via {@link com.azure.core.credential.TokenRequestContext#setTenantId(String)}.
      *
      * @return An updated instance of this builder.
      */

sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/util/IdentityUtil.java

@@ -5,7 +5,6 @@
 
 import com.azure.core.credential.TokenRequestContext;
 import com.azure.core.exception.ClientAuthenticationException;
-import com.azure.core.experimental.credential.TokenRequestContextExperimental;
 import com.azure.core.util.CoreUtils;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.identity.implementation.IdentityClientOptions;
@@ -24,13 +23,7 @@ private IdentityUtil() { }
     public static String resolveTenantId(String currentTenantId, TokenRequestContext requestContext,
                                          IdentityClientOptions options) {
 
-        String contextTenantId;
-        if (requestContext instanceof TokenRequestContextExperimental) {
-            TokenRequestContextExperimental experimental = ((TokenRequestContextExperimental) requestContext);
-            contextTenantId = experimental.getTenantId();
-        } else {
-            return currentTenantId;
-        }
+        String contextTenantId = requestContext.getTenantId();
 
         if (!options.isMultiTenantAuthenticationAllowed()) {
             if (contextTenantId != null && !currentTenantId.equals(contextTenantId)

sdk/identity/azure-identity/src/main/java/module-info.java

@@ -3,7 +3,6 @@
 
 module com.azure.identity {
     requires transitive com.azure.core;
-    requires transitive com.azure.core.experimental;
 
     requires msal4j;
     requires msal4j.persistence.extension;

sdk/identity/azure-identity/src/test/java/com/azure/identity/util/IdentityUtilTests.java

@@ -3,8 +3,8 @@
 
 package com.azure.identity.util;
 
+import com.azure.core.credential.TokenRequestContext;
 import com.azure.core.exception.ClientAuthenticationException;
-import com.azure.core.experimental.credential.TokenRequestContextExperimental;
 import com.azure.identity.implementation.IdentityClientOptions;
 import com.azure.identity.implementation.util.IdentityUtil;
 import org.junit.Assert;
@@ -20,7 +20,7 @@ public class IdentityUtilTests {
     public void testMultiTenantAuthenticationEnabled() throws Exception {
         String currentTenant = "tenant";
         String newTenant = "tenant-new";
-        TokenRequestContextExperimental trc = new TokenRequestContextExperimental()
+        TokenRequestContext trc = new TokenRequestContext()
             .setScopes(Arrays.asList("http://vault.azure.net/.default"))
             .setTenantId(newTenant);
         IdentityClientOptions options = new IdentityClientOptions();
@@ -33,7 +33,7 @@ public void testMultiTenantAuthenticationEnabled() throws Exception {
     public void testMultiTenantAuthenticationDisabled() throws Exception {
         String currentTenant = "tenant";
         String newTenant = "tenant-new";
-        TokenRequestContextExperimental trc = new TokenRequestContextExperimental()
+        TokenRequestContext trc = new TokenRequestContext()
             .setScopes(Arrays.asList("http://vault.azure.net/.default"))
             .setTenantId("newTenant");
         IdentityClientOptions options = new IdentityClientOptions();