diff --git a/.vscode/cspell.json b/.vscode/cspell.json index 65976390ca91..ecb4e40d3801 100644 --- a/.vscode/cspell.json +++ b/.vscode/cspell.json @@ -1577,7 +1577,10 @@ "urllistofbytes", "urllistoflistofbytes", "urlmapofbytes", - "xffffffffffff" + "xffffffffffff", + "oidcrequesturi", + "uami", + "imds" ] }, { diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 1fa30caaabd9..e9595506b1b8 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -534,7 +534,6 @@ com.azure.v2:azure-perf-test-parent;2.0.0-beta.1;2.0.0-beta.1 com.azure.v2:azure-core;2.0.0-beta.1;2.0.0-beta.1 com.azure.v2:azure-core-test;2.0.0-beta.1;2.0.0-beta.1 com.azure.v2:azure-data-appconfiguration;2.0.0-beta.1;2.0.0-beta.1 -com.azure.v2:azure-identity;2.0.0-beta.1;2.0.0-beta.1 com.azure.v2:azure-security-keyvault-administration;5.0.0-beta.1;5.0.0-beta.1 com.azure.v2:azure-security-keyvault-certificates;5.0.0-beta.1;5.0.0-beta.1 com.azure.v2:azure-security-keyvault-secrets;5.0.0-beta.1;5.0.0-beta.1 @@ -561,7 +560,6 @@ io.clientcore:optional-dependency-tests;1.0.0-beta.1;1.0.0-beta.1 unreleased_com.azure:azure-core;1.58.0-beta.1 unreleased_com.azure.v2:azure-core;2.0.0-beta.1 -unreleased_com.azure.v2:azure-identity;2.0.0-beta.1 unreleased_com.azure.v2:azure-data-appconfiguration;2.0.0-beta.1 unreleased_io.clientcore:http-netty4;1.0.0-beta.1 diff --git a/pom.xml b/pom.xml index 0727ad1c393f..568b5f44b8a8 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,6 @@ sdk/hybridkubernetes sdk/hybridnetwork sdk/identity - sdk/identity-v2 sdk/imagebuilder sdk/impactreporting sdk/informaticadatamanagement diff --git a/sdk/appconfiguration-v2/azure-data-appconfiguration/pom.xml b/sdk/appconfiguration-v2/azure-data-appconfiguration/pom.xml index 6fa1ec48924d..52bf12da8829 100644 --- a/sdk/appconfiguration-v2/azure-data-appconfiguration/pom.xml +++ b/sdk/appconfiguration-v2/azure-data-appconfiguration/pom.xml @@ -59,14 +59,6 @@ Code generated by Microsoft (R) TypeSpec Code Generator. 2.0.0-beta.1 - - - com.azure.v2 - azure-identity - 2.0.0-beta.1 - test - - com.azure.v2 azure-core-test diff --git a/sdk/appconfiguration-v2/azure-data-appconfiguration/src/samples/java/com/azure/v2/data/appconfiguration/EntraIdAuthentication.java b/sdk/appconfiguration-v2/azure-data-appconfiguration/src/samples/java/com/azure/v2/data/appconfiguration/EntraIdAuthentication.java index 1cd798317785..086a4d2d3703 100644 --- a/sdk/appconfiguration-v2/azure-data-appconfiguration/src/samples/java/com/azure/v2/data/appconfiguration/EntraIdAuthentication.java +++ b/sdk/appconfiguration-v2/azure-data-appconfiguration/src/samples/java/com/azure/v2/data/appconfiguration/EntraIdAuthentication.java @@ -4,8 +4,8 @@ package com.azure.v2.data.appconfiguration; import com.azure.v2.data.appconfiguration.models.ConfigurationSetting; -import com.azure.v2.identity.AzureCliCredential; -import com.azure.v2.identity.AzureCliCredentialBuilder; +import com.azure.v2.core.identity.AzureCliCredential; +import com.azure.v2.core.identity.AzureCliCredentialBuilder; import io.clientcore.core.utils.configuration.Configuration; /** diff --git a/sdk/appconfiguration-v2/azure-data-appconfiguration/src/test/java/com/azure/v2/data/appconfiguration/TestHelper.java b/sdk/appconfiguration-v2/azure-data-appconfiguration/src/test/java/com/azure/v2/data/appconfiguration/TestHelper.java index d310b84294e1..8f7cfcd65478 100644 --- a/sdk/appconfiguration-v2/azure-data-appconfiguration/src/test/java/com/azure/v2/data/appconfiguration/TestHelper.java +++ b/sdk/appconfiguration-v2/azure-data-appconfiguration/src/test/java/com/azure/v2/data/appconfiguration/TestHelper.java @@ -4,8 +4,8 @@ import com.azure.v2.core.credentials.TokenCredential; import com.azure.v2.core.test.InterceptorManager; -import com.azure.v2.identity.AzurePowerShellCredentialBuilder; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.AzurePowerShellCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import io.clientcore.core.http.client.HttpClient; import io.clientcore.core.utils.CoreUtils; import io.clientcore.core.utils.configuration.Configuration; diff --git a/sdk/core-v2/azure-core/checkstyle-suppressions.xml b/sdk/core-v2/azure-core/checkstyle-suppressions.xml index 7e441c15b95d..7d33d20446ed 100644 --- a/sdk/core-v2/azure-core/checkstyle-suppressions.xml +++ b/sdk/core-v2/azure-core/checkstyle-suppressions.xml @@ -5,4 +5,10 @@ + + + + + + diff --git a/sdk/core-v2/azure-core/pom.xml b/sdk/core-v2/azure-core/pom.xml index 84266ae8edd4..a09f2a011b94 100644 --- a/sdk/core-v2/azure-core/pom.xml +++ b/sdk/core-v2/azure-core/pom.xml @@ -78,6 +78,18 @@ 1.0.0-beta.11 + + com.microsoft.azure + msal4j-persistence-extension + 1.3.0 + + + + com.microsoft.azure + msal4j + 1.23.1 + + org.junit.jupiter junit-jupiter-api @@ -108,10 +120,39 @@ 1.37 test + + + org.mockito + mockito-inline + 4.11.0 + test + + + + net.bytebuddy + byte-buddy + 1.17.7 + test + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.6.1 + + + + + com.microsoft.azure:msal4j:[1.23.1] + com.microsoft.azure:msal4j-persistence-extension:[1.3.0] + + + + + org.apache.maven.plugins diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AuthorizationCodeCredential.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AuthorizationCodeCredential.java similarity index 85% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AuthorizationCodeCredential.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AuthorizationCodeCredential.java index f6440e3153c7..35a940d51fde 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AuthorizationCodeCredential.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AuthorizationCodeCredential.java @@ -1,23 +1,23 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.implementation.client.MsalAuthenticationAccountCache; -import com.azure.v2.identity.implementation.client.ConfidentialClient; -import com.azure.v2.identity.implementation.client.PublicClient; -import com.azure.v2.identity.implementation.models.ConfidentialClientOptions; -import com.azure.v2.identity.implementation.models.MsalToken; -import com.azure.v2.identity.implementation.models.PublicClientOptions; -import com.azure.v2.identity.implementation.util.LoggingUtil; import com.azure.v2.core.credentials.TokenCredential; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.implementation.identity.client.ConfidentialClient; +import com.azure.v2.core.implementation.identity.client.MsalAuthenticationAccountCache; +import com.azure.v2.core.implementation.identity.client.PublicClient; +import com.azure.v2.core.implementation.identity.models.ConfidentialClientOptions; +import com.azure.v2.core.implementation.identity.models.MsalToken; +import com.azure.v2.core.implementation.identity.models.PublicClientOptions; +import com.azure.v2.core.implementation.identity.util.LoggingUtil; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.core.utils.CoreUtils; -import static com.azure.v2.identity.implementation.util.LoggingUtil.logAndThrowTokenError; +import static com.azure.v2.core.implementation.identity.util.LoggingUtil.logAndThrowTokenError; /** *

Authorization Code authentication in Azure is a type of authentication mechanism that allows users to @@ -45,7 +45,7 @@ * .build(); * * - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity * @see AuthorizationCodeCredentialBuilder */ public class AuthorizationCodeCredential implements TokenCredential { diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AuthorizationCodeCredentialBuilder.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AuthorizationCodeCredentialBuilder.java similarity index 95% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AuthorizationCodeCredentialBuilder.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AuthorizationCodeCredentialBuilder.java index 434f38409df0..b10e80dcf593 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AuthorizationCodeCredentialBuilder.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AuthorizationCodeCredentialBuilder.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.PublicClientOptions; -import com.azure.v2.identity.implementation.util.ValidationUtil; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.PublicClientOptions; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; import io.clientcore.core.instrumentation.logging.ClientLogger; import java.net.URI; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureCliCredential.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureCliCredential.java similarity index 78% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureCliCredential.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureCliCredential.java index 9211bd77bbf0..e7c4a7908ebd 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureCliCredential.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureCliCredential.java @@ -1,19 +1,19 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.exceptions.CredentialUnavailableException; -import com.azure.v2.identity.implementation.client.DevToolsClient; -import com.azure.v2.identity.implementation.models.DevToolsClientOptions; -import com.azure.v2.identity.implementation.util.LoggingUtil; import com.azure.v2.core.credentials.TokenCredential; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.identity.models.CredentialUnavailableException; +import com.azure.v2.core.implementation.identity.client.DevToolsClient; +import com.azure.v2.core.implementation.identity.models.DevToolsClientOptions; +import com.azure.v2.core.implementation.identity.util.LoggingUtil; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.instrumentation.logging.ClientLogger; -import static com.azure.v2.identity.implementation.util.LoggingUtil.logAndThrowTokenError; +import static com.azure.v2.core.implementation.identity.util.LoggingUtil.logAndThrowTokenError; /** *

The Azure CLI is a command-line tool that allows users to manage Azure resources from their local machine or @@ -49,31 +49,31 @@ * TokenCredential azureCliCredential = new AzureCliCredentialBuilder().build(); * * - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity * @see AzureCliCredentialBuilder */ public class AzureCliCredential implements TokenCredential { private static final ClientLogger LOGGER = new ClientLogger(AzureCliCredential.class); - private final DevToolsClient devToolslClient; + private final DevToolsClient devToolsClient; /** * Creates an AzureCliCredential with the given dev tools client options. * @param devToolsClientOptions the options to configure the dev tools client */ AzureCliCredential(DevToolsClientOptions devToolsClientOptions) { - devToolslClient = new DevToolsClient(devToolsClientOptions); + devToolsClient = new DevToolsClient(devToolsClientOptions); } @Override public AccessToken getToken(TokenRequestContext request) { try { - AccessToken accessToken = devToolslClient.authenticateWithAzureCli(request); + AccessToken accessToken = devToolsClient.authenticateWithAzureCli(request); LoggingUtil.logTokenSuccess(LOGGER, request); return accessToken; } catch (RuntimeException ex) { throw logAndThrowTokenError(LOGGER, request, ex, - devToolslClient.getClientOptions().isChained() + devToolsClient.getClientOptions().isChained() ? CredentialUnavailableException::new : CredentialAuthenticationException::new); } diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureCliCredentialBuilder.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureCliCredentialBuilder.java similarity index 94% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureCliCredentialBuilder.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureCliCredentialBuilder.java index ea7620bb592e..a17cb07a9e16 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureCliCredentialBuilder.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureCliCredentialBuilder.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.DevToolsClientOptions; -import com.azure.v2.identity.implementation.util.IdentityUtil; -import com.azure.v2.identity.implementation.util.ValidationUtil; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.DevToolsClientOptions; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; import io.clientcore.core.instrumentation.logging.ClientLogger; import java.time.Duration; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureDeveloperCliCredential.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureDeveloperCliCredential.java similarity index 80% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureDeveloperCliCredential.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureDeveloperCliCredential.java index 7dcb95d02c88..1668b1f16ce9 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureDeveloperCliCredential.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureDeveloperCliCredential.java @@ -1,19 +1,19 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.exceptions.CredentialUnavailableException; -import com.azure.v2.identity.implementation.client.DevToolsClient; -import com.azure.v2.identity.implementation.models.DevToolsClientOptions; -import com.azure.v2.identity.implementation.util.LoggingUtil; import com.azure.v2.core.credentials.TokenCredential; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.identity.models.CredentialUnavailableException; +import com.azure.v2.core.implementation.identity.client.DevToolsClient; +import com.azure.v2.core.implementation.identity.models.DevToolsClientOptions; +import com.azure.v2.core.implementation.identity.util.LoggingUtil; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.instrumentation.logging.ClientLogger; -import static com.azure.v2.identity.implementation.util.LoggingUtil.logAndThrowTokenError; +import static com.azure.v2.core.implementation.identity.util.LoggingUtil.logAndThrowTokenError; /** *

Azure Developer CLI is a command-line interface tool that allows developers to create, manage, and deploy @@ -51,13 +51,13 @@ * TokenCredential azureDevCliCredential = new AzureDeveloperCliCredentialBuilder().build(); * * - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity * @see AzureDeveloperCliCredentialBuilder */ public class AzureDeveloperCliCredential implements TokenCredential { private static final ClientLogger LOGGER = new ClientLogger(AzureDeveloperCliCredential.class); - private final DevToolsClient devToolslClient; + private final DevToolsClient devToolsClient; /** * Creates an AzureDeveloperClCredential with given dev tools client options. @@ -65,18 +65,18 @@ public class AzureDeveloperCliCredential implements TokenCredential { * @param clientOptions the options to configure the dev tools client */ AzureDeveloperCliCredential(DevToolsClientOptions clientOptions) { - devToolslClient = new DevToolsClient(clientOptions); + devToolsClient = new DevToolsClient(clientOptions); } @Override public AccessToken getToken(TokenRequestContext request) { try { - AccessToken accessToken = devToolslClient.authenticateWithAzureDeveloperCli(request); + AccessToken accessToken = devToolsClient.authenticateWithAzureDeveloperCli(request); LoggingUtil.logTokenSuccess(LOGGER, request); return accessToken; } catch (RuntimeException ex) { throw logAndThrowTokenError(LOGGER, request, ex, - devToolslClient.getClientOptions().isChained() + devToolsClient.getClientOptions().isChained() ? CredentialUnavailableException::new : CredentialAuthenticationException::new); } diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureDeveloperCliCredentialBuilder.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureDeveloperCliCredentialBuilder.java similarity index 94% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureDeveloperCliCredentialBuilder.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureDeveloperCliCredentialBuilder.java index ea6b7df98b18..ff5ef79bc0c2 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureDeveloperCliCredentialBuilder.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureDeveloperCliCredentialBuilder.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.DevToolsClientOptions; -import com.azure.v2.identity.implementation.util.IdentityUtil; -import com.azure.v2.identity.implementation.util.ValidationUtil; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.DevToolsClientOptions; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; import io.clientcore.core.instrumentation.logging.ClientLogger; import java.time.Duration; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzurePipelinesCredential.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzurePipelinesCredential.java similarity index 90% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzurePipelinesCredential.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzurePipelinesCredential.java index 1bfe823a62bc..299e2097f066 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzurePipelinesCredential.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzurePipelinesCredential.java @@ -1,16 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.implementation.client.ConfidentialClient; -import com.azure.v2.identity.implementation.models.ConfidentialClientOptions; -import com.azure.v2.identity.implementation.models.OidcTokenResponse; -import com.azure.v2.identity.implementation.util.IdentityUtil; -import com.azure.v2.identity.implementation.util.LoggingUtil; import com.azure.v2.core.credentials.TokenCredential; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.implementation.identity.client.ConfidentialClient; +import com.azure.v2.core.implementation.identity.models.ConfidentialClientOptions; +import com.azure.v2.core.implementation.identity.models.OidcTokenResponse; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; +import com.azure.v2.core.implementation.identity.util.LoggingUtil; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.http.models.HttpHeaderName; import io.clientcore.core.http.models.HttpHeaders; @@ -24,7 +24,7 @@ import java.io.IOException; -import static com.azure.v2.identity.implementation.util.LoggingUtil.logAndThrowTokenError; +import static com.azure.v2.core.implementation.identity.util.LoggingUtil.logAndThrowTokenError; /** * The {@link AzurePipelinesCredential} acquires a token using the Azure Pipelines service connection. diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzurePipelinesCredentialBuilder.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzurePipelinesCredentialBuilder.java similarity index 95% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzurePipelinesCredentialBuilder.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzurePipelinesCredentialBuilder.java index 6a6683c3ded9..d5e8bbc6859d 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzurePipelinesCredentialBuilder.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzurePipelinesCredentialBuilder.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.ConfidentialClientOptions; -import com.azure.v2.identity.implementation.util.ValidationUtil; -import com.azure.v2.identity.models.TokenCachePersistenceOptions; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.ConfidentialClientOptions; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; +import com.azure.v2.core.identity.models.TokenCachePersistenceOptions; import io.clientcore.core.http.models.HttpHeaderName; import io.clientcore.core.http.pipeline.HttpInstrumentationOptions; import io.clientcore.core.instrumentation.logging.ClientLogger; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzurePowerShellCredential.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzurePowerShellCredential.java similarity index 79% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzurePowerShellCredential.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzurePowerShellCredential.java index 8ee8fa3e1f33..e39fdb7923fe 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzurePowerShellCredential.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzurePowerShellCredential.java @@ -1,19 +1,19 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.exceptions.CredentialUnavailableException; -import com.azure.v2.identity.implementation.client.DevToolsClient; -import com.azure.v2.identity.implementation.models.DevToolsClientOptions; -import com.azure.v2.identity.implementation.util.LoggingUtil; import com.azure.v2.core.credentials.TokenCredential; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.identity.models.CredentialUnavailableException; +import com.azure.v2.core.implementation.identity.client.DevToolsClient; +import com.azure.v2.core.implementation.identity.models.DevToolsClientOptions; +import com.azure.v2.core.implementation.identity.util.LoggingUtil; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.instrumentation.logging.ClientLogger; -import static com.azure.v2.identity.implementation.util.LoggingUtil.logAndThrowTokenError; +import static com.azure.v2.core.implementation.identity.util.LoggingUtil.logAndThrowTokenError; /** *

The Azure Powershell is a command-line tool that allows users to manage Azure resources from their local machine @@ -52,27 +52,27 @@ * TokenCredential powerShellCredential = new AzurePowerShellCredentialBuilder().build(); * * - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity * @see AzurePowerShellCredentialBuilder */ public class AzurePowerShellCredential implements TokenCredential { private static final ClientLogger LOGGER = new ClientLogger(AzurePowerShellCredential.class); - private final DevToolsClient devToolslClient; + private final DevToolsClient devToolsClient; AzurePowerShellCredential(DevToolsClientOptions options) { - devToolslClient = new DevToolsClient(options); + devToolsClient = new DevToolsClient(options); } @Override public AccessToken getToken(TokenRequestContext request) { try { - AccessToken accessToken = devToolslClient.authenticateWithAzurePowerShell(request); + AccessToken accessToken = devToolsClient.authenticateWithAzurePowerShell(request); LoggingUtil.logTokenSuccess(LOGGER, request); return accessToken; } catch (RuntimeException ex) { throw logAndThrowTokenError(LOGGER, request, ex, - devToolslClient.getClientOptions().isChained() + devToolsClient.getClientOptions().isChained() ? CredentialUnavailableException::new : CredentialAuthenticationException::new); } diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzurePowerShellCredentialBuilder.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzurePowerShellCredentialBuilder.java similarity index 93% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzurePowerShellCredentialBuilder.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzurePowerShellCredentialBuilder.java index ed7e8fc90456..f8f8f710fa04 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzurePowerShellCredentialBuilder.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzurePowerShellCredentialBuilder.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.DevToolsClientOptions; -import com.azure.v2.identity.implementation.util.IdentityUtil; -import com.azure.v2.identity.implementation.util.ValidationUtil; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.DevToolsClientOptions; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; import io.clientcore.core.instrumentation.logging.ClientLogger; import java.util.Arrays; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureToolkitCredential.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureToolkitCredential.java similarity index 85% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureToolkitCredential.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureToolkitCredential.java index 4ec448efa34d..677a61d5e744 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureToolkitCredential.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureToolkitCredential.java @@ -1,23 +1,23 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.exceptions.CredentialUnavailableException; -import com.azure.v2.identity.implementation.client.PublicClient; -import com.azure.v2.identity.implementation.models.MsalToken; -import com.azure.v2.identity.implementation.models.PublicClientOptions; -import com.azure.v2.identity.implementation.util.IdentityConstants; -import com.azure.v2.identity.implementation.util.LoggingUtil; import com.azure.v2.core.credentials.TokenCredential; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.identity.models.CredentialUnavailableException; +import com.azure.v2.core.implementation.identity.client.PublicClient; +import com.azure.v2.core.implementation.identity.models.MsalToken; +import com.azure.v2.core.implementation.identity.models.PublicClientOptions; +import com.azure.v2.core.implementation.identity.util.IdentityConstants; +import com.azure.v2.core.implementation.identity.util.LoggingUtil; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.instrumentation.logging.ClientLogger; import java.util.concurrent.atomic.AtomicReference; -import static com.azure.v2.identity.implementation.util.LoggingUtil.logAndThrowTokenError; +import static com.azure.v2.core.implementation.identity.util.LoggingUtil.logAndThrowTokenError; /** *

@@ -56,7 +56,7 @@ * TokenCredential azureToolkitCredential = new AzureToolkitCredentialBuilder().build(); * * - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity * @see AzureToolkitCredentialBuilder */ public class AzureToolkitCredential implements TokenCredential { diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureToolkitCredentialBuilder.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureToolkitCredentialBuilder.java similarity index 93% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureToolkitCredentialBuilder.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureToolkitCredentialBuilder.java index 42188d139a7a..9351cd4f24f1 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureToolkitCredentialBuilder.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/AzureToolkitCredentialBuilder.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.PublicClientOptions; -import com.azure.v2.identity.implementation.util.IdentityUtil; -import com.azure.v2.identity.implementation.util.ValidationUtil; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.PublicClientOptions; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; import io.clientcore.core.instrumentation.logging.ClientLogger; import java.util.Arrays; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ChainedTokenCredential.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ChainedTokenCredential.java similarity index 96% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ChainedTokenCredential.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ChainedTokenCredential.java index b3e2aaa1a4de..9f566ca1962f 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ChainedTokenCredential.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ChainedTokenCredential.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; import com.azure.v2.core.credentials.TokenCredential; import com.azure.v2.core.credentials.TokenRequestContext; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.exceptions.CredentialUnavailableException; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.identity.models.CredentialUnavailableException; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.instrumentation.logging.ClientLogger; @@ -42,7 +42,7 @@ * .build(); * * - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity * @see ChainedTokenCredentialBuilder */ public class ChainedTokenCredential implements TokenCredential { diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ChainedTokenCredentialBuilder.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ChainedTokenCredentialBuilder.java similarity index 98% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ChainedTokenCredentialBuilder.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ChainedTokenCredentialBuilder.java index a1977a95b0d0..df2f7a29d4b6 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ChainedTokenCredentialBuilder.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ChainedTokenCredentialBuilder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; import com.azure.v2.core.credentials.TokenCredential; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientAssertionCredential.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientAssertionCredential.java similarity index 91% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientAssertionCredential.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientAssertionCredential.java index 0aab4f6227d6..578dbc0c6d42 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientAssertionCredential.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientAssertionCredential.java @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.client.ConfidentialClient; -import com.azure.v2.identity.implementation.models.ConfidentialClientOptions; -import com.azure.v2.identity.implementation.util.LoggingUtil; import com.azure.v2.core.credentials.TokenCredential; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.implementation.identity.client.ConfidentialClient; +import com.azure.v2.core.implementation.identity.models.ConfidentialClientOptions; +import com.azure.v2.core.implementation.identity.util.LoggingUtil; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.core.models.CoreException; -import static com.azure.v2.identity.implementation.util.LoggingUtil.logAndThrowTokenError; +import static com.azure.v2.core.implementation.identity.util.LoggingUtil.logAndThrowTokenError; /** *

The ClientAssertionCredential acquires a token via client assertion and service principal authentication. @@ -51,7 +51,7 @@ * .build(); * * - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity * @see ClientCertificateCredentialBuilder */ public class ClientAssertionCredential implements TokenCredential { diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientAssertionCredentialBuilder.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientAssertionCredentialBuilder.java similarity index 94% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientAssertionCredentialBuilder.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientAssertionCredentialBuilder.java index c681c349cd61..ca9357f73984 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientAssertionCredentialBuilder.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientAssertionCredentialBuilder.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.ConfidentialClientOptions; -import com.azure.v2.identity.implementation.util.ValidationUtil; -import com.azure.v2.identity.models.TokenCachePersistenceOptions; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.ConfidentialClientOptions; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; +import com.azure.v2.core.identity.models.TokenCachePersistenceOptions; import io.clientcore.core.instrumentation.logging.ClientLogger; import java.util.function.Supplier; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientCertificateCredential.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientCertificateCredential.java similarity index 92% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientCertificateCredential.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientCertificateCredential.java index c2a84de96907..19da7c278754 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientCertificateCredential.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientCertificateCredential.java @@ -1,21 +1,21 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.implementation.client.ConfidentialClient; -import com.azure.v2.identity.implementation.models.ConfidentialClientOptions; -import com.azure.v2.identity.implementation.util.LoggingUtil; import com.azure.v2.core.credentials.TokenCredential; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.implementation.identity.client.ConfidentialClient; +import com.azure.v2.core.implementation.identity.models.ConfidentialClientOptions; +import com.azure.v2.core.implementation.identity.util.LoggingUtil; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.instrumentation.logging.ClientLogger; import java.io.ByteArrayInputStream; import java.util.Objects; -import static com.azure.v2.identity.implementation.util.LoggingUtil.logAndThrowTokenError; +import static com.azure.v2.core.implementation.identity.util.LoggingUtil.logAndThrowTokenError; /** *

The ClientCertificateCredential acquires a token via service principal authentication. It is a type of @@ -72,7 +72,7 @@ * .build(); * * - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity * @see ClientCertificateCredentialBuilder */ public class ClientCertificateCredential implements TokenCredential { diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientCertificateCredentialBuilder.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientCertificateCredentialBuilder.java similarity index 95% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientCertificateCredentialBuilder.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientCertificateCredentialBuilder.java index 05d25f38778f..beb840bd46e9 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientCertificateCredentialBuilder.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientCertificateCredentialBuilder.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.ConfidentialClientOptions; -import com.azure.v2.identity.implementation.util.IdentityUtil; -import com.azure.v2.identity.implementation.util.ValidationUtil; -import com.azure.v2.identity.models.TokenCachePersistenceOptions; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.ConfidentialClientOptions; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; +import com.azure.v2.core.identity.models.TokenCachePersistenceOptions; import io.clientcore.core.instrumentation.logging.ClientLogger; import java.io.ByteArrayInputStream; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientSecretCredential.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientSecretCredential.java similarity index 90% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientSecretCredential.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientSecretCredential.java index 0c191e2ccf73..04b6abe3eade 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientSecretCredential.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientSecretCredential.java @@ -1,20 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.implementation.client.ConfidentialClient; -import com.azure.v2.identity.implementation.models.ConfidentialClientOptions; -import com.azure.v2.identity.implementation.util.LoggingUtil; import com.azure.v2.core.credentials.TokenCredential; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.implementation.identity.client.ConfidentialClient; +import com.azure.v2.core.implementation.identity.models.ConfidentialClientOptions; +import com.azure.v2.core.implementation.identity.util.LoggingUtil; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.instrumentation.logging.ClientLogger; import java.util.Objects; -import static com.azure.v2.identity.implementation.util.LoggingUtil.logAndThrowTokenError; +import static com.azure.v2.core.implementation.identity.util.LoggingUtil.logAndThrowTokenError; /** *

The ClientSecretCredential acquires a token via service principal authentication. It is a type of authentication @@ -55,7 +55,7 @@ * .build(); * * - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity * @see ClientSecretCredentialBuilder */ public class ClientSecretCredential implements TokenCredential { diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientSecretCredentialBuilder.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientSecretCredentialBuilder.java similarity index 93% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientSecretCredentialBuilder.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientSecretCredentialBuilder.java index e98e507d7f36..40bbc6fae1b4 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ClientSecretCredentialBuilder.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ClientSecretCredentialBuilder.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.ConfidentialClientOptions; -import com.azure.v2.identity.implementation.util.ValidationUtil; -import com.azure.v2.identity.models.TokenCachePersistenceOptions; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.ConfidentialClientOptions; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; +import com.azure.v2.core.identity.models.TokenCachePersistenceOptions; import io.clientcore.core.instrumentation.logging.ClientLogger; /** diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/CredentialBuilderBase.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/CredentialBuilderBase.java similarity index 89% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/CredentialBuilderBase.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/CredentialBuilderBase.java index 5645bf7563be..27d18ea00b6f 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/CredentialBuilderBase.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/CredentialBuilderBase.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.HttpPipelineOptions; -import com.azure.v2.identity.implementation.util.ValidationUtil; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.HttpPipelineOptions; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.core.utils.configuration.Configuration; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/DefaultAzureCredential.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/DefaultAzureCredential.java similarity index 98% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/DefaultAzureCredential.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/DefaultAzureCredential.java index 1a4308cfba5b..1a726ac25c99 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/DefaultAzureCredential.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/DefaultAzureCredential.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; import com.azure.v2.core.credentials.TokenCredential; @@ -69,7 +69,7 @@ * = new DefaultAzureCredentialBuilder().managedIdentityClientId("<Managed-Identity-Client-Id").build(); * * - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity * @see DefaultAzureCredentialBuilder * @see ManagedIdentityCredential * @see EnvironmentCredential diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/DefaultAzureCredentialBuilder.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/DefaultAzureCredentialBuilder.java similarity index 95% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/DefaultAzureCredentialBuilder.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/DefaultAzureCredentialBuilder.java index b3fcb9ecf013..212eb223b304 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/DefaultAzureCredentialBuilder.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/DefaultAzureCredentialBuilder.java @@ -1,16 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.client.IdentityLogOptionsImpl; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.ConfidentialClientOptions; -import com.azure.v2.identity.implementation.models.ManagedIdentityClientOptions; -import com.azure.v2.identity.implementation.models.DevToolsClientOptions; -import com.azure.v2.identity.implementation.models.PublicClientOptions; -import com.azure.v2.identity.implementation.util.IdentityUtil; import com.azure.v2.core.credentials.TokenCredential; +import com.azure.v2.core.implementation.identity.client.IdentityLogOptionsImpl; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.ConfidentialClientOptions; +import com.azure.v2.core.implementation.identity.models.DevToolsClientOptions; +import com.azure.v2.core.implementation.identity.models.ManagedIdentityClientOptions; +import com.azure.v2.core.implementation.identity.models.PublicClientOptions; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.core.utils.CoreUtils; import io.clientcore.core.utils.configuration.Configuration; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/DeviceCodeCredential.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/DeviceCodeCredential.java similarity index 88% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/DeviceCodeCredential.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/DeviceCodeCredential.java index ed3dbbed8977..68880a222ab2 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/DeviceCodeCredential.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/DeviceCodeCredential.java @@ -1,24 +1,26 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.exceptions.CredentialUnavailableException; -import com.azure.v2.identity.implementation.client.MsalAuthenticationAccountCache; -import com.azure.v2.identity.implementation.client.PublicClient; -import com.azure.v2.identity.implementation.models.MsalAuthenticationAccount; -import com.azure.v2.identity.implementation.models.MsalToken; -import com.azure.v2.identity.implementation.models.PublicClientOptions; -import com.azure.v2.identity.implementation.util.LoggingUtil; import com.azure.v2.core.credentials.TokenCredential; import com.azure.v2.core.credentials.TokenRequestContext; -import com.azure.v2.identity.models.AuthenticationRecord; -import com.azure.v2.identity.models.TokenCachePersistenceOptions; +import com.azure.v2.core.identity.models.AuthenticationRequiredException; +import com.azure.v2.core.identity.models.AzureAuthorityHosts; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.identity.models.CredentialUnavailableException; +import com.azure.v2.core.implementation.identity.client.MsalAuthenticationAccountCache; +import com.azure.v2.core.implementation.identity.client.PublicClient; +import com.azure.v2.core.implementation.identity.models.MsalAuthenticationAccount; +import com.azure.v2.core.implementation.identity.models.MsalToken; +import com.azure.v2.core.implementation.identity.models.PublicClientOptions; +import com.azure.v2.core.implementation.identity.util.LoggingUtil; +import com.azure.v2.core.identity.models.AuthenticationRecord; +import com.azure.v2.core.identity.models.TokenCachePersistenceOptions; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.instrumentation.logging.ClientLogger; -import static com.azure.v2.identity.implementation.util.LoggingUtil.logAndThrowTokenError; +import static com.azure.v2.core.implementation.identity.util.LoggingUtil.logAndThrowTokenError; /** *

Device code authentication is a type of authentication flow offered by @@ -68,7 +70,7 @@ * TokenCredential deviceCodeCredential = new DeviceCodeCredentialBuilder().build(); * * - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity * @see DeviceCodeCredentialBuilder */ public class DeviceCodeCredential implements TokenCredential { diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/DeviceCodeCredentialBuilder.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/DeviceCodeCredentialBuilder.java similarity index 93% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/DeviceCodeCredentialBuilder.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/DeviceCodeCredentialBuilder.java index b23420e7c731..2057ff28a39d 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/DeviceCodeCredentialBuilder.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/DeviceCodeCredentialBuilder.java @@ -1,15 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.PublicClientOptions; -import com.azure.v2.identity.implementation.util.IdentityConstants; import com.azure.v2.core.credentials.TokenRequestContext; -import com.azure.v2.identity.models.AuthenticationRecord; -import com.azure.v2.identity.models.DeviceCodeInfo; -import com.azure.v2.identity.models.TokenCachePersistenceOptions; +import com.azure.v2.core.identity.models.AuthenticationRequiredException; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.PublicClientOptions; +import com.azure.v2.core.implementation.identity.util.IdentityConstants; +import com.azure.v2.core.identity.models.AuthenticationRecord; +import com.azure.v2.core.identity.models.DeviceCodeInfo; +import com.azure.v2.core.identity.models.TokenCachePersistenceOptions; import java.util.function.Consumer; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/EntraIdCredentialBuilderBase.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/EntraIdCredentialBuilderBase.java similarity index 97% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/EntraIdCredentialBuilderBase.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/EntraIdCredentialBuilderBase.java index c80866ff285b..e14b536a400b 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/EntraIdCredentialBuilderBase.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/EntraIdCredentialBuilderBase.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.util.IdentityUtil; -import com.azure.v2.identity.implementation.util.ValidationUtil; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; import io.clientcore.core.http.client.HttpClient; -import io.clientcore.core.http.pipeline.HttpPipelinePolicy; import io.clientcore.core.http.pipeline.HttpInstrumentationOptions; +import io.clientcore.core.http.pipeline.HttpPipelinePolicy; import io.clientcore.core.http.pipeline.HttpRedirectOptions; import io.clientcore.core.http.pipeline.HttpRetryOptions; import io.clientcore.core.instrumentation.logging.ClientLogger; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/EnvironmentCredential.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/EnvironmentCredential.java similarity index 94% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/EnvironmentCredential.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/EnvironmentCredential.java index df1942f3b9bc..ca7ae9b28e51 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/EnvironmentCredential.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/EnvironmentCredential.java @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialUnavailableException; -import com.azure.v2.identity.implementation.models.ConfidentialClientOptions; -import com.azure.v2.identity.implementation.util.IdentityUtil; -import com.azure.v2.identity.implementation.util.LoggingUtil; -import com.azure.v2.identity.implementation.util.ValidationUtil; import com.azure.v2.core.credentials.TokenCredential; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialUnavailableException; +import com.azure.v2.core.implementation.identity.models.ConfidentialClientOptions; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; +import com.azure.v2.core.implementation.identity.util.LoggingUtil; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.core.utils.CoreUtils; @@ -50,7 +50,7 @@ * TokenCredential environmentCredential = new EnvironmentCredentialBuilder().build(); * * - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity * @see EnvironmentCredentialBuilder */ public class EnvironmentCredential implements TokenCredential { diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/EnvironmentCredentialBuilder.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/EnvironmentCredentialBuilder.java similarity index 93% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/EnvironmentCredentialBuilder.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/EnvironmentCredentialBuilder.java index e854292f9b74..4ecbe1f95c34 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/EnvironmentCredentialBuilder.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/EnvironmentCredentialBuilder.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.ConfidentialClientOptions; -import com.azure.v2.identity.implementation.util.ValidationUtil; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.ConfidentialClientOptions; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; import io.clientcore.core.instrumentation.logging.ClientLogger; import java.util.concurrent.ExecutorService; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/InteractiveBrowserCredential.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/InteractiveBrowserCredential.java similarity index 88% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/InteractiveBrowserCredential.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/InteractiveBrowserCredential.java index a6d8d8f9a111..b3c01aad404c 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/InteractiveBrowserCredential.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/InteractiveBrowserCredential.java @@ -1,24 +1,26 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialUnavailableException; -import com.azure.v2.identity.implementation.client.MsalAuthenticationAccountCache; -import com.azure.v2.identity.implementation.client.PublicClient; -import com.azure.v2.identity.implementation.models.MsalAuthenticationAccount; -import com.azure.v2.identity.implementation.models.MsalToken; -import com.azure.v2.identity.implementation.models.PublicClientOptions; -import com.azure.v2.identity.implementation.util.LoggingUtil; import com.azure.v2.core.credentials.TokenCredential; import com.azure.v2.core.credentials.TokenRequestContext; -import com.azure.v2.identity.models.AuthenticationRecord; -import com.azure.v2.identity.models.TokenCachePersistenceOptions; +import com.azure.v2.core.identity.models.AuthenticationRequiredException; +import com.azure.v2.core.identity.models.AzureAuthorityHosts; +import com.azure.v2.core.identity.models.CredentialUnavailableException; +import com.azure.v2.core.implementation.identity.client.MsalAuthenticationAccountCache; +import com.azure.v2.core.implementation.identity.client.PublicClient; +import com.azure.v2.core.implementation.identity.models.MsalAuthenticationAccount; +import com.azure.v2.core.implementation.identity.models.MsalToken; +import com.azure.v2.core.implementation.identity.models.PublicClientOptions; +import com.azure.v2.core.implementation.identity.util.LoggingUtil; +import com.azure.v2.core.identity.models.AuthenticationRecord; +import com.azure.v2.core.identity.models.TokenCachePersistenceOptions; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.core.models.CoreException; -import static com.azure.v2.identity.implementation.util.LoggingUtil.logAndThrowTokenError; +import static com.azure.v2.core.implementation.identity.util.LoggingUtil.logAndThrowTokenError; /** *

Interactive browser authentication is a type of authentication flow offered by @@ -61,7 +63,7 @@ * created, it may be passed into the builder of many of the Azure SDK for Java client builders as the 'credential' * parameter.

* - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity * @see InteractiveBrowserCredentialBuilder */ public class InteractiveBrowserCredential implements TokenCredential { diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/InteractiveBrowserCredentialBuilder.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/InteractiveBrowserCredentialBuilder.java similarity index 94% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/InteractiveBrowserCredentialBuilder.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/InteractiveBrowserCredentialBuilder.java index acb976ce1cb3..33b96b10cf55 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/InteractiveBrowserCredentialBuilder.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/InteractiveBrowserCredentialBuilder.java @@ -1,16 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.PublicClientOptions; -import com.azure.v2.identity.implementation.util.IdentityConstants; -import com.azure.v2.identity.implementation.util.IdentityUtil; import com.azure.v2.core.credentials.TokenRequestContext; -import com.azure.v2.identity.models.AuthenticationRecord; -import com.azure.v2.identity.models.BrowserCustomizationOptions; -import com.azure.v2.identity.models.TokenCachePersistenceOptions; +import com.azure.v2.core.identity.models.AuthenticationRequiredException; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.PublicClientOptions; +import com.azure.v2.core.implementation.identity.util.IdentityConstants; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; +import com.azure.v2.core.identity.models.AuthenticationRecord; +import com.azure.v2.core.identity.models.BrowserCustomizationOptions; +import com.azure.v2.core.identity.models.TokenCachePersistenceOptions; import io.clientcore.core.instrumentation.logging.ClientLogger; import java.net.URI; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ManagedIdentityCredential.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ManagedIdentityCredential.java similarity index 92% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ManagedIdentityCredential.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ManagedIdentityCredential.java index 95cc74234934..22c5fbc0e3b0 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ManagedIdentityCredential.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ManagedIdentityCredential.java @@ -1,22 +1,22 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.exceptions.CredentialUnavailableException; -import com.azure.v2.identity.implementation.client.ManagedIdentityClient; -import com.azure.v2.identity.implementation.models.ManagedIdentityClientOptions; -import com.azure.v2.identity.implementation.util.LoggingUtil; import com.azure.v2.core.credentials.TokenCredential; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.identity.models.CredentialUnavailableException; +import com.azure.v2.core.implementation.identity.client.ManagedIdentityClient; +import com.azure.v2.core.implementation.identity.models.ManagedIdentityClientOptions; +import com.azure.v2.core.implementation.identity.util.LoggingUtil; import com.microsoft.aad.msal4j.ManagedIdentityApplication; import com.microsoft.aad.msal4j.ManagedIdentitySourceType; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.core.utils.CoreUtils; -import static com.azure.v2.identity.implementation.util.LoggingUtil.logAndThrowTokenError; +import static com.azure.v2.core.implementation.identity.util.LoggingUtil.logAndThrowTokenError; /** *

Azure @@ -72,7 +72,7 @@ * .build(); * * - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity */ public final class ManagedIdentityCredential implements TokenCredential { private static final ClientLogger LOGGER = new ClientLogger(ManagedIdentityCredential.class); diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ManagedIdentityCredentialBuilder.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ManagedIdentityCredentialBuilder.java similarity index 96% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ManagedIdentityCredentialBuilder.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ManagedIdentityCredentialBuilder.java index b4e3a827f768..fec403c1fd86 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/ManagedIdentityCredentialBuilder.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/ManagedIdentityCredentialBuilder.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.ManagedIdentityClientOptions; -import com.azure.v2.identity.implementation.util.ValidationUtil; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.ManagedIdentityClientOptions; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.core.utils.SharedExecutorService; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/OnBehalfOfCredential.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/OnBehalfOfCredential.java similarity index 88% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/OnBehalfOfCredential.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/OnBehalfOfCredential.java index 51a11ac4bc77..dbcc2cfbe36c 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/OnBehalfOfCredential.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/OnBehalfOfCredential.java @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.implementation.client.ConfidentialClient; -import com.azure.v2.identity.implementation.models.ConfidentialClientOptions; -import com.azure.v2.identity.implementation.util.LoggingUtil; import com.azure.v2.core.credentials.TokenCredential; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.implementation.identity.client.ConfidentialClient; +import com.azure.v2.core.implementation.identity.models.ConfidentialClientOptions; +import com.azure.v2.core.implementation.identity.util.LoggingUtil; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.instrumentation.logging.ClientLogger; -import static com.azure.v2.identity.implementation.util.LoggingUtil.logAndThrowTokenError; +import static com.azure.v2.core.implementation.identity.util.LoggingUtil.logAndThrowTokenError; /** *

On Behalf of authentication in Azure is a way for a user or application to authenticate to a service or resource @@ -41,7 +41,7 @@ * .build(); * * - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity * @see OnBehalfOfCredentialBuilder */ public class OnBehalfOfCredential implements TokenCredential { diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/OnBehalfOfCredentialBuilder.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/OnBehalfOfCredentialBuilder.java similarity index 94% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/OnBehalfOfCredentialBuilder.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/OnBehalfOfCredentialBuilder.java index 1186be8b2401..66c2b1de8e32 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/OnBehalfOfCredentialBuilder.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/OnBehalfOfCredentialBuilder.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.ConfidentialClientOptions; -import com.azure.v2.identity.implementation.util.IdentityUtil; -import com.azure.v2.identity.implementation.util.ValidationUtil; -import com.azure.v2.identity.models.TokenCachePersistenceOptions; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.ConfidentialClientOptions; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; +import com.azure.v2.core.identity.models.TokenCachePersistenceOptions; import io.clientcore.core.instrumentation.logging.ClientLogger; import java.io.InputStream; @@ -166,7 +166,7 @@ public OnBehalfOfCredentialBuilder clientAssertion(Supplier clientAssert * Creates a new {@link OnBehalfOfCredential} with the current configurations. * * @return a {@link OnBehalfOfCredential} with the current configurations. - * @throws IllegalArgumentException if eiter both the client secret and certificate are configured or none of them + * @throws IllegalArgumentException if either both the client secret and certificate are configured or none of them * are configured. */ public OnBehalfOfCredential build() { diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/WorkloadIdentityCredential.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/WorkloadIdentityCredential.java similarity index 92% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/WorkloadIdentityCredential.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/WorkloadIdentityCredential.java index 858793f3a1e9..aae8ed8dad0d 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/WorkloadIdentityCredential.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/WorkloadIdentityCredential.java @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.exceptions.CredentialUnavailableException; -import com.azure.v2.identity.implementation.client.SynchronousAccessor; -import com.azure.v2.identity.implementation.models.ConfidentialClientOptions; -import com.azure.v2.identity.implementation.util.ValidationUtil; import com.azure.v2.core.credentials.TokenCredential; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.identity.models.CredentialUnavailableException; +import com.azure.v2.core.implementation.identity.client.SynchronousAccessor; +import com.azure.v2.core.implementation.identity.models.ConfidentialClientOptions; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.core.utils.CoreUtils; @@ -48,7 +48,7 @@ * .build(); * * - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity * @see WorkloadIdentityCredentialBuilder */ public class WorkloadIdentityCredential implements TokenCredential { diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/WorkloadIdentityCredentialBuilder.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/WorkloadIdentityCredentialBuilder.java similarity index 89% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/WorkloadIdentityCredentialBuilder.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/WorkloadIdentityCredentialBuilder.java index 18c2709ec776..211eb19d8762 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/WorkloadIdentityCredentialBuilder.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/WorkloadIdentityCredentialBuilder.java @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.ConfidentialClientOptions; -import com.azure.v2.identity.implementation.util.ValidationUtil; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.ConfidentialClientOptions; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.core.utils.CoreUtils; import io.clientcore.core.utils.configuration.Configuration; -import static com.azure.v2.identity.implementation.util.IdentityUtil.PROPERTY_AZURE_TENANT_ID; -import static com.azure.v2.identity.implementation.util.IdentityUtil.PROPERTY_AZURE_CLIENT_ID; -import static com.azure.v2.identity.implementation.util.IdentityUtil.AZURE_FEDERATED_TOKEN_FILE; +import static com.azure.v2.core.implementation.identity.util.IdentityUtil.AZURE_FEDERATED_TOKEN_FILE; +import static com.azure.v2.core.implementation.identity.util.IdentityUtil.PROPERTY_AZURE_CLIENT_ID; +import static com.azure.v2.core.implementation.identity.util.IdentityUtil.PROPERTY_AZURE_TENANT_ID; /** * Fluent credential builder for instantiating a {@link WorkloadIdentityCredential}. diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/models/AuthenticationRecord.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/AuthenticationRecord.java similarity index 96% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/models/AuthenticationRecord.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/AuthenticationRecord.java index 0660a0fbf53e..180258a43bcb 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/models/AuthenticationRecord.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/AuthenticationRecord.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.models; +package com.azure.v2.core.identity.models; -import com.azure.v2.identity.InteractiveBrowserCredential; -import com.azure.v2.identity.InteractiveBrowserCredentialBuilder; +import com.azure.v2.core.identity.InteractiveBrowserCredential; +import com.azure.v2.core.identity.InteractiveBrowserCredentialBuilder; import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.core.models.CoreException; import io.clientcore.core.serialization.json.JsonReader; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AuthenticationRequiredException.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/AuthenticationRequiredException.java similarity index 92% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AuthenticationRequiredException.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/AuthenticationRequiredException.java index 61a5c8465d02..7e143cb1d2eb 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AuthenticationRequiredException.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/AuthenticationRequiredException.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity.models; import com.azure.v2.core.credentials.TokenRequestContext; -import com.azure.v2.identity.exceptions.CredentialUnavailableException; +import com.azure.v2.core.identity.InteractiveBrowserCredential; /** *

The Authentication Required Exception is thrown by {@link InteractiveBrowserCredential} @@ -12,7 +12,7 @@ * needs to be initiated via {@link InteractiveBrowserCredential#authenticate()} or * {@link InteractiveBrowserCredential#authenticate()} APIs respectively before fetching an access token.

* - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity * @see InteractiveBrowserCredential */ public final class AuthenticationRequiredException extends CredentialUnavailableException { diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureAuthorityHosts.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/AzureAuthorityHosts.java similarity index 76% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureAuthorityHosts.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/AzureAuthorityHosts.java index 89c7c688b13c..64a0f406caca 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/AzureAuthorityHosts.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/AzureAuthorityHosts.java @@ -1,18 +1,19 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity.models; + +import com.azure.v2.core.identity.EntraIdCredentialBuilderBase; /** - *

Defines fields exposing the well known authority hosts for the Azure Public Cloud and sovereign clouds.

+ *

Defines fields exposing the well-known authority hosts for the Azure Public Cloud and sovereign clouds.

* - *

Users looking to target a specific cloud instance of Azure, can pass an instance of Azure Authority Hosts + *

Users looking to target a specific cloud instance of Azure can pass an instance of Azure Authority Hosts * as a parameter to the {@link EntraIdCredentialBuilderBase#authorityHost(String)}. The authentication requests * will be routed accordingly to the specified target authority host.

* * @see EntraIdCredentialBuilderBase */ -//TODO: @g2vinay, Move to Azure-Core-V2. public final class AzureAuthorityHosts { private AzureAuthorityHosts() { @@ -33,7 +34,13 @@ private AzureAuthorityHosts() { */ public static final String AZURE_GOVERNMENT = "https://login.microsoftonline.us/"; - static String getDefaultScope(String authorityHost) { + /** + * Gets the default scope for the given authority host. + * + * @param authorityHost the authority host + * @return the default scope for the given authority host + */ + public static String getDefaultScope(String authorityHost) { switch (authorityHost) { case AZURE_PUBLIC_CLOUD: return "https://management.core.windows.net//.default"; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/models/BrowserCustomizationOptions.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/BrowserCustomizationOptions.java similarity index 97% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/models/BrowserCustomizationOptions.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/BrowserCustomizationOptions.java index 7cd8275d9041..a77116dd43f4 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/models/BrowserCustomizationOptions.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/BrowserCustomizationOptions.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.models; +package com.azure.v2.core.identity.models; /** * Represent Options to customize browser view. diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/exceptions/CredentialAuthenticationException.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/CredentialAuthenticationException.java similarity index 93% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/exceptions/CredentialAuthenticationException.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/CredentialAuthenticationException.java index 111f88775a68..0b5bd2f3ac88 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/exceptions/CredentialAuthenticationException.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/CredentialAuthenticationException.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.exceptions; +package com.azure.v2.core.identity.models; import com.azure.v2.core.credentials.TokenCredential; import io.clientcore.core.credentials.oauth.AccessToken; @@ -14,7 +14,7 @@ * This exception breaks the chained authentication flow of chained credentials. *

* - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity */ public class CredentialAuthenticationException extends RuntimeException { diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/exceptions/CredentialUnavailableException.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/CredentialUnavailableException.java similarity index 93% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/exceptions/CredentialUnavailableException.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/CredentialUnavailableException.java index f1c7556c4775..7ca46586ba21 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/exceptions/CredentialUnavailableException.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/CredentialUnavailableException.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.exceptions; +package com.azure.v2.core.identity.models; import com.azure.v2.core.credentials.TokenCredential; import io.clientcore.core.credentials.oauth.AccessToken; @@ -10,7 +10,7 @@ * The exception thrown when a {@link TokenCredential} did not attempt to authenticate and retrieve {@link AccessToken}, * as its prerequisite information or state was not available. * - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity */ public class CredentialUnavailableException extends RuntimeException { diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/models/DeviceCodeInfo.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/DeviceCodeInfo.java similarity index 94% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/models/DeviceCodeInfo.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/DeviceCodeInfo.java index d82f30b94b5e..fce798f3982a 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/models/DeviceCodeInfo.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/DeviceCodeInfo.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.models; +package com.azure.v2.core.identity.models; -import com.azure.v2.identity.DeviceCodeCredential; -import com.azure.v2.identity.DeviceCodeCredentialBuilder; +import com.azure.v2.core.identity.DeviceCodeCredential; +import com.azure.v2.core.identity.DeviceCodeCredentialBuilder; import java.time.OffsetDateTime; import java.util.function.Consumer; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/models/TokenCachePersistenceOptions.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/TokenCachePersistenceOptions.java similarity index 96% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/models/TokenCachePersistenceOptions.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/TokenCachePersistenceOptions.java index 3fcd2b698e82..19763e080997 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/models/TokenCachePersistenceOptions.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/TokenCachePersistenceOptions.java @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.models; +package com.azure.v2.core.identity.models; /** * Represents the Persistence Token Cache options used to setup the persistent access token cache. @@ -8,7 +8,7 @@ * TokenCachePersistenceOptions can be configured directly on the Token Credential builders for the Token Credentials * that support it. * - * @see com.azure.v2.identity + * @see com.azure.v2.core.identity */ public final class TokenCachePersistenceOptions { private boolean unencryptedStorageAllowed; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/models/package-info.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/package-info.java similarity index 76% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/models/package-info.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/package-info.java index c1b4c2862eed..67107ff495b4 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/models/package-info.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/models/package-info.java @@ -4,4 +4,4 @@ /** * Package containing model classes. */ -package com.azure.v2.identity.models; +package com.azure.v2.core.identity.models; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/package-info.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/package-info.java similarity index 71% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/package-info.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/package-info.java index 73c62305f7b0..58c41a1b0893 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/package-info.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/identity/package-info.java @@ -2,13 +2,13 @@ // Licensed under the MIT License. /** - *

The Azure Identity library provides + *

This package provides * Microsoft Entra ID token * authentication support across the - * Azure SDK. The library focuses on + * Azure SDK. This package focuses on * OAuth authentication with Microsoft Entra ID, and it offers various credential classes capable of acquiring a Microsoft Entra token * to authenticate service requests. All the credential classes in this package are implementations of the - * TokenCredential interface offered by azure-core, and any of them can be used to construct service clients capable + * TokenCredential interface, and any of them can be used to construct service clients capable * of authenticating with a TokenCredential.

*/ -package com.azure.v2.identity; +package com.azure.v2.core.identity; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/AzureToolkitCacheAccessor.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/AzureToolkitCacheAccessor.java similarity index 97% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/AzureToolkitCacheAccessor.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/AzureToolkitCacheAccessor.java index ac78b7595fc8..78a4a6be1ba9 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/AzureToolkitCacheAccessor.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/AzureToolkitCacheAccessor.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.client; +package com.azure.v2.core.implementation.identity.client; -import com.azure.v2.identity.exceptions.CredentialUnavailableException; +import com.azure.v2.core.identity.models.CredentialUnavailableException; import com.microsoft.aad.msal4jextensions.persistence.CacheFileAccessor; import com.microsoft.aad.msal4jextensions.persistence.mac.KeyChainAccessor; import com.sun.jna.Platform; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/ClientBase.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/ClientBase.java similarity index 93% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/ClientBase.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/ClientBase.java index 9afbc3520af1..336cf92a2e56 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/ClientBase.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/ClientBase.java @@ -1,16 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.client; +package com.azure.v2.core.implementation.identity.client; -import com.azure.v2.identity.implementation.models.ClientOptions; -import com.azure.v2.identity.implementation.models.HttpPipelineOptions; -import com.azure.v2.identity.implementation.util.IdentityUtil; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.implementation.identity.models.HttpPipelineOptions; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; +import io.clientcore.core.http.pipeline.HttpInstrumentationOptions; +import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy; import io.clientcore.core.http.pipeline.HttpPipeline; import io.clientcore.core.http.pipeline.HttpPipelineBuilder; import io.clientcore.core.http.pipeline.HttpPipelinePolicy; -import io.clientcore.core.http.pipeline.HttpInstrumentationOptions; -import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy; import io.clientcore.core.http.pipeline.HttpRedirectPolicy; import io.clientcore.core.http.pipeline.HttpRetryPolicy; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/ConfidentialClient.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/ConfidentialClient.java similarity index 97% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/ConfidentialClient.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/ConfidentialClient.java index 8de1ba1e4796..c63dec29ea8e 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/ConfidentialClient.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/ConfidentialClient.java @@ -1,34 +1,34 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.client; - -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.models.TokenCachePersistenceOptions; -import com.azure.v2.identity.implementation.models.ConfidentialClientOptions; -import com.azure.v2.identity.implementation.models.MsalToken; -import com.azure.v2.identity.implementation.util.CertificateUtil; -import com.azure.v2.identity.implementation.util.IdentityUtil; +package com.azure.v2.core.implementation.identity.client; + import com.azure.v2.core.credentials.TokenRequestContext; -import com.microsoft.aad.msal4j.ConfidentialClientApplication; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.implementation.identity.models.ConfidentialClientOptions; +import com.azure.v2.core.implementation.identity.models.MsalToken; +import com.azure.v2.core.implementation.identity.util.CertificateUtil; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; +import com.azure.v2.core.identity.models.TokenCachePersistenceOptions; +import com.microsoft.aad.msal4j.AuthorizationCodeParameters; +import com.microsoft.aad.msal4j.ClaimsRequest; import com.microsoft.aad.msal4j.ClientCredentialFactory; import com.microsoft.aad.msal4j.ClientCredentialParameters; -import com.microsoft.aad.msal4j.ClaimsRequest; -import com.microsoft.aad.msal4j.IClientCredential; -import com.microsoft.aad.msal4j.IAuthenticationResult; +import com.microsoft.aad.msal4j.ConfidentialClientApplication; import com.microsoft.aad.msal4j.IAccount; -import com.microsoft.aad.msal4j.AuthorizationCodeParameters; -import com.microsoft.aad.msal4j.SilentParameters; +import com.microsoft.aad.msal4j.IAuthenticationResult; +import com.microsoft.aad.msal4j.IClientCredential; import com.microsoft.aad.msal4j.OnBehalfOfParameters; +import com.microsoft.aad.msal4j.SilentParameters; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.core.utils.SharedExecutorService; -import java.io.InputStream; -import java.io.IOException; -import java.io.ByteArrayInputStream; import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; import java.net.MalformedURLException; import java.net.URI; import java.nio.file.Files; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/DevToolsClient.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/DevToolsClient.java similarity index 96% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/DevToolsClient.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/DevToolsClient.java index 637f5dfae720..34702973c858 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/DevToolsClient.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/DevToolsClient.java @@ -1,16 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.client; - -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.exceptions.CredentialUnavailableException; -import com.azure.v2.identity.implementation.models.DevToolsClientOptions; -import com.azure.v2.identity.implementation.models.AzureCliToken; -import com.azure.v2.identity.implementation.util.IdentityUtil; -import com.azure.v2.identity.implementation.util.ScopeUtil; -import com.azure.v2.identity.implementation.util.ValidationUtil; +package com.azure.v2.core.implementation.identity.client; + import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.identity.models.CredentialUnavailableException; +import com.azure.v2.core.implementation.identity.models.AzureCliToken; +import com.azure.v2.core.implementation.identity.models.DevToolsClientOptions; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; +import com.azure.v2.core.implementation.identity.util.ScopeUtil; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; import com.sun.jna.Platform; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.instrumentation.logging.ClientLogger; @@ -22,10 +22,10 @@ import java.io.IOException; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; +import java.time.LocalDateTime; import java.time.OffsetDateTime; import java.time.ZoneId; import java.time.ZoneOffset; -import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; @@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; -import static com.azure.v2.identity.implementation.util.IdentityUtil.isWindowsPlatform; +import static com.azure.v2.core.implementation.identity.util.IdentityUtil.isWindowsPlatform; public class DevToolsClient extends ClientBase { diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/HttpPipelineAdapter.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/HttpPipelineAdapter.java similarity index 95% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/HttpPipelineAdapter.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/HttpPipelineAdapter.java index 31f4442ad18c..ec71bdc96bbb 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/HttpPipelineAdapter.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/HttpPipelineAdapter.java @@ -1,18 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.client; +package com.azure.v2.core.implementation.identity.client; -import com.azure.v2.identity.implementation.models.HttpPipelineOptions; -import com.azure.v2.identity.implementation.util.IdentityUtil; +import com.azure.v2.core.implementation.identity.models.HttpPipelineOptions; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; +import com.microsoft.aad.msal4j.HttpRequest; import com.microsoft.aad.msal4j.IHttpClient; import com.microsoft.aad.msal4j.IHttpResponse; -import com.microsoft.aad.msal4j.HttpRequest; +import io.clientcore.core.http.models.HttpHeader; import io.clientcore.core.http.models.HttpHeaderName; import io.clientcore.core.http.models.HttpHeaders; import io.clientcore.core.http.models.HttpMethod; import io.clientcore.core.http.models.Response; -import io.clientcore.core.http.models.HttpHeader; import io.clientcore.core.http.pipeline.HttpPipeline; import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.core.instrumentation.logging.LogLevel; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/IdentityLogOptionsImpl.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/IdentityLogOptionsImpl.java similarity index 96% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/IdentityLogOptionsImpl.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/IdentityLogOptionsImpl.java index d06f7e87e48b..adcc15e6e3d0 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/IdentityLogOptionsImpl.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/IdentityLogOptionsImpl.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.client; +package com.azure.v2.core.implementation.identity.client; import io.clientcore.core.instrumentation.logging.LogLevel; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/LinuxKeyRingAccessor.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/LinuxKeyRingAccessor.java similarity index 98% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/LinuxKeyRingAccessor.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/LinuxKeyRingAccessor.java index d2cdaf6b11af..33c0f6d48c3b 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/LinuxKeyRingAccessor.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/LinuxKeyRingAccessor.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.client; +package com.azure.v2.core.implementation.identity.client; import com.microsoft.aad.msal4jextensions.persistence.linux.ISecurityLibrary; import com.sun.jna.Pointer; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/ManagedIdentityClient.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/ManagedIdentityClient.java similarity index 92% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/ManagedIdentityClient.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/ManagedIdentityClient.java index d4f176908e3f..aecacd5582a9 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/ManagedIdentityClient.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/ManagedIdentityClient.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.client; +package com.azure.v2.core.implementation.identity.client; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.implementation.models.MsalToken; -import com.azure.v2.identity.implementation.models.ManagedIdentityClientOptions; -import com.azure.v2.identity.implementation.util.ScopeUtil; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.implementation.identity.models.ManagedIdentityClientOptions; +import com.azure.v2.core.implementation.identity.models.MsalToken; +import com.azure.v2.core.implementation.identity.util.ScopeUtil; import com.microsoft.aad.msal4j.ManagedIdentityApplication; import com.microsoft.aad.msal4j.ManagedIdentityId; import com.microsoft.aad.msal4j.ManagedIdentitySourceType; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/MsalAuthenticationAccountCache.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/MsalAuthenticationAccountCache.java similarity index 89% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/MsalAuthenticationAccountCache.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/MsalAuthenticationAccountCache.java index f80b96283bdf..50f73bd71b3e 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/MsalAuthenticationAccountCache.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/MsalAuthenticationAccountCache.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.client; +package com.azure.v2.core.implementation.identity.client; import com.azure.v2.core.credentials.TokenRequestContext; -import com.azure.v2.identity.implementation.models.MsalAuthenticationAccount; -import com.azure.v2.identity.implementation.models.MsalToken; -import com.azure.v2.identity.implementation.models.PublicClientOptions; -import com.azure.v2.identity.models.AuthenticationRecord; +import com.azure.v2.core.implementation.identity.models.MsalAuthenticationAccount; +import com.azure.v2.core.implementation.identity.models.MsalToken; +import com.azure.v2.core.implementation.identity.models.PublicClientOptions; +import com.azure.v2.core.identity.models.AuthenticationRecord; import com.microsoft.aad.msal4j.IAuthenticationResult; import io.clientcore.core.credentials.oauth.AccessToken; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/PersistentTokenCacheImpl.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/PersistentTokenCacheImpl.java similarity index 96% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/PersistentTokenCacheImpl.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/PersistentTokenCacheImpl.java index 646e9ac32d1f..cc9e6383cd64 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/PersistentTokenCacheImpl.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/PersistentTokenCacheImpl.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.client; +package com.azure.v2.core.implementation.identity.client; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.implementation.util.IdentityUtil; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; import com.microsoft.aad.msal4j.ITokenCacheAccessAspect; import com.microsoft.aad.msal4j.ITokenCacheAccessContext; import com.microsoft.aad.msal4jextensions.PersistenceSettings; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/PowershellManager.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/PowershellManager.java similarity index 95% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/PowershellManager.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/PowershellManager.java index 2e89dafa0c6c..7d1995f57149 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/PowershellManager.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/PowershellManager.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.client; +package com.azure.v2.core.implementation.identity.client; -import com.azure.v2.identity.exceptions.CredentialUnavailableException; +import com.azure.v2.core.identity.models.CredentialUnavailableException; import com.sun.jna.Platform; import io.clientcore.core.instrumentation.logging.ClientLogger; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/PublicClient.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/PublicClient.java similarity index 96% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/PublicClient.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/PublicClient.java index e2730e2addff..ce40023e50ec 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/PublicClient.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/PublicClient.java @@ -1,27 +1,27 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.client; - -import com.azure.v2.identity.exceptions.CredentialUnavailableException; -import com.azure.v2.identity.models.TokenCachePersistenceOptions; -import com.azure.v2.identity.models.BrowserCustomizationOptions; -import com.azure.v2.identity.models.DeviceCodeInfo; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.implementation.models.MsalToken; -import com.azure.v2.identity.implementation.models.PublicClientOptions; -import com.azure.v2.identity.implementation.util.IdentityUtil; +package com.azure.v2.core.implementation.identity.client; + import com.azure.v2.core.credentials.TokenRequestContext; -import com.microsoft.aad.msal4j.PublicClientApplication; -import com.microsoft.aad.msal4j.InteractiveRequestParameters; -import com.microsoft.aad.msal4j.IAccount; -import com.microsoft.aad.msal4j.SilentParameters; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.identity.models.CredentialUnavailableException; +import com.azure.v2.core.implementation.identity.models.MsalToken; +import com.azure.v2.core.implementation.identity.models.PublicClientOptions; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; +import com.azure.v2.core.identity.models.BrowserCustomizationOptions; +import com.azure.v2.core.identity.models.DeviceCodeInfo; +import com.azure.v2.core.identity.models.TokenCachePersistenceOptions; +import com.microsoft.aad.msal4j.AuthorizationCodeParameters; import com.microsoft.aad.msal4j.ClaimsRequest; -import com.microsoft.aad.msal4j.SystemBrowserOptions; import com.microsoft.aad.msal4j.DeviceCodeFlowParameters; +import com.microsoft.aad.msal4j.IAccount; +import com.microsoft.aad.msal4j.InteractiveRequestParameters; import com.microsoft.aad.msal4j.Prompt; -import com.microsoft.aad.msal4j.AuthorizationCodeParameters; +import com.microsoft.aad.msal4j.PublicClientApplication; import com.microsoft.aad.msal4j.RefreshTokenParameters; +import com.microsoft.aad.msal4j.SilentParameters; +import com.microsoft.aad.msal4j.SystemBrowserOptions; import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.core.utils.CoreUtils; import io.clientcore.core.utils.SharedExecutorService; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/SynchronousAccessor.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/SynchronousAccessor.java similarity index 97% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/SynchronousAccessor.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/SynchronousAccessor.java index fb4635b73d14..b7175e84fa9a 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/SynchronousAccessor.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/SynchronousAccessor.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.client; +package com.azure.v2.core.implementation.identity.client; import java.time.Duration; import java.util.concurrent.locks.ReentrantLock; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/package-info.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/package-info.java similarity index 73% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/package-info.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/package-info.java index c04c8993c258..b7c8be2bd7cd 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/client/package-info.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/client/package-info.java @@ -4,4 +4,4 @@ /** * Package containing client classes for credentials. */ -package com.azure.v2.identity.implementation.client; +package com.azure.v2.core.implementation.identity.client; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/AzureCliToken.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/AzureCliToken.java similarity index 98% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/AzureCliToken.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/AzureCliToken.java index 7cd8d696d1ed..f851d11c514e 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/AzureCliToken.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/AzureCliToken.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.models; +package com.azure.v2.core.implementation.identity.models; import io.clientcore.core.serialization.json.JsonReader; import io.clientcore.core.serialization.json.JsonSerializable; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/ClientOptions.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/ClientOptions.java similarity index 96% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/ClientOptions.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/ClientOptions.java index 42f8f94d63ff..8c31eab23d31 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/ClientOptions.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/ClientOptions.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.models; +package com.azure.v2.core.implementation.identity.models; -import com.azure.v2.identity.AzureAuthorityHosts; -import com.azure.v2.identity.models.TokenCachePersistenceOptions; -import com.azure.v2.identity.implementation.client.IdentityLogOptionsImpl; -import com.azure.v2.identity.implementation.util.ValidationUtil; +import com.azure.v2.core.identity.models.AzureAuthorityHosts; +import com.azure.v2.core.identity.models.TokenCachePersistenceOptions; +import com.azure.v2.core.implementation.identity.client.IdentityLogOptionsImpl; +import com.azure.v2.core.implementation.identity.util.ValidationUtil; import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.core.utils.configuration.Configuration; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/ConfidentialClientOptions.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/ConfidentialClientOptions.java similarity index 99% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/ConfidentialClientOptions.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/ConfidentialClientOptions.java index 2950ebcdaf58..6f3f218fe351 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/ConfidentialClientOptions.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/ConfidentialClientOptions.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.models; +package com.azure.v2.core.implementation.identity.models; import com.microsoft.aad.msal4j.UserAssertion; import io.clientcore.core.http.pipeline.HttpPipeline; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/DevToolsClientOptions.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/DevToolsClientOptions.java similarity index 97% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/DevToolsClientOptions.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/DevToolsClientOptions.java index 7f03b7b9ddac..679da1563c9c 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/DevToolsClientOptions.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/DevToolsClientOptions.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.models; +package com.azure.v2.core.implementation.identity.models; import java.time.Duration; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/HttpPipelineOptions.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/HttpPipelineOptions.java similarity index 98% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/HttpPipelineOptions.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/HttpPipelineOptions.java index 83b2103eaa49..f3246ccc5b7b 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/HttpPipelineOptions.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/HttpPipelineOptions.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.models; +package com.azure.v2.core.implementation.identity.models; import io.clientcore.core.http.client.HttpClient; import io.clientcore.core.http.pipeline.HttpInstrumentationOptions; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/ManagedIdentityClientOptions.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/ManagedIdentityClientOptions.java similarity index 97% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/ManagedIdentityClientOptions.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/ManagedIdentityClientOptions.java index dd1bc9ad4834..3c520dc2527c 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/ManagedIdentityClientOptions.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/ManagedIdentityClientOptions.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.models; +package com.azure.v2.core.implementation.identity.models; /** * Represents Managed Identity Client Options used in Managed Identity OAuth Flow . diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/MsalAuthenticationAccount.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/MsalAuthenticationAccount.java similarity index 95% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/MsalAuthenticationAccount.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/MsalAuthenticationAccount.java index a303c0b2bda3..fab6c20d7151 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/MsalAuthenticationAccount.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/MsalAuthenticationAccount.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.models; +package com.azure.v2.core.implementation.identity.models; -import com.azure.v2.identity.models.AuthenticationRecord; +import com.azure.v2.core.identity.models.AuthenticationRecord; import com.microsoft.aad.msal4j.IAccount; import com.microsoft.aad.msal4j.ITenantProfile; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/MsalToken.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/MsalToken.java similarity index 97% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/MsalToken.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/MsalToken.java index a7ed6b1192ee..5b77ea6fd125 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/MsalToken.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/MsalToken.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.models; +package com.azure.v2.core.implementation.identity.models; import com.microsoft.aad.msal4j.IAccount; import com.microsoft.aad.msal4j.IAuthenticationResult; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/OidcTokenResponse.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/OidcTokenResponse.java similarity index 96% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/OidcTokenResponse.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/OidcTokenResponse.java index 9353475910b9..c3d88d81ea7d 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/OidcTokenResponse.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/OidcTokenResponse.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.models; +package com.azure.v2.core.implementation.identity.models; import io.clientcore.core.serialization.json.JsonReader; import io.clientcore.core.serialization.json.JsonSerializable; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/PublicClientOptions.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/PublicClientOptions.java similarity index 95% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/PublicClientOptions.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/PublicClientOptions.java index fe90e4e85b83..5960a4225607 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/PublicClientOptions.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/PublicClientOptions.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.models; +package com.azure.v2.core.implementation.identity.models; -import com.azure.v2.identity.models.AuthenticationRecord; -import com.azure.v2.identity.models.BrowserCustomizationOptions; -import com.azure.v2.identity.models.DeviceCodeInfo; -import com.azure.v2.identity.InteractiveBrowserCredential; +import com.azure.v2.core.identity.models.AuthenticationRecord; +import com.azure.v2.core.identity.models.BrowserCustomizationOptions; +import com.azure.v2.core.identity.models.DeviceCodeInfo; +import com.azure.v2.core.identity.InteractiveBrowserCredential; import java.net.URI; import java.util.function.Consumer; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/package-info.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/package-info.java similarity index 74% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/package-info.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/package-info.java index a310e492678f..703a4fb46c37 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/models/package-info.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/models/package-info.java @@ -4,4 +4,4 @@ /** * Package containing model classes for credentials and clients */ -package com.azure.v2.identity.implementation.models; +package com.azure.v2.core.implementation.identity.models; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/CertificateUtil.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/CertificateUtil.java similarity index 98% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/CertificateUtil.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/CertificateUtil.java index 5f5c7b6d0084..4ecd9d96cdca 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/CertificateUtil.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/CertificateUtil.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.util; +package com.azure.v2.core.implementation.identity.util; import io.clientcore.core.instrumentation.logging.ClientLogger; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/IdentityConstants.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/IdentityConstants.java similarity index 86% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/IdentityConstants.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/IdentityConstants.java index 02e2d95c17e2..8a3f4c0c1cd8 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/IdentityConstants.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/IdentityConstants.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.util; +package com.azure.v2.core.implementation.identity.util; /** * The util class to store commonly used Identity constants. diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/IdentityUtil.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/IdentityUtil.java similarity index 97% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/IdentityUtil.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/IdentityUtil.java index d833141d3355..adb1a00848f8 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/IdentityUtil.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/IdentityUtil.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.util; +package com.azure.v2.core.implementation.identity.util; -import com.azure.v2.identity.models.BrowserCustomizationOptions; -import com.azure.v2.identity.implementation.models.ClientOptions; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.implementation.identity.models.ClientOptions; +import com.azure.v2.core.identity.models.BrowserCustomizationOptions; import io.clientcore.core.http.models.HttpHeaderName; import io.clientcore.core.instrumentation.logging.ClientLogger; import io.clientcore.core.models.CoreException; @@ -14,14 +14,14 @@ import io.clientcore.core.utils.CoreUtils; import io.clientcore.core.utils.configuration.Configuration; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.io.ByteArrayOutputStream; -import java.util.List; +import java.util.Arrays; import java.util.Collections; +import java.util.List; import java.util.Map; -import java.util.Arrays; import java.util.Objects; import static io.clientcore.core.serialization.json.JsonToken.END_OBJECT; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/LoggingUtil.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/LoggingUtil.java similarity index 98% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/LoggingUtil.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/LoggingUtil.java index 435002c35745..014d6e4520f1 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/LoggingUtil.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/LoggingUtil.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.util; +package com.azure.v2.core.implementation.identity.util; import com.azure.v2.core.credentials.TokenRequestContext; import io.clientcore.core.instrumentation.logging.ClientLogger; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/ScopeUtil.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/ScopeUtil.java similarity index 97% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/ScopeUtil.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/ScopeUtil.java index 5ff5f615899f..7c54d3524259 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/ScopeUtil.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/ScopeUtil.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.util; +package com.azure.v2.core.implementation.identity.util; import io.clientcore.core.instrumentation.logging.ClientLogger; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/ValidationUtil.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/ValidationUtil.java similarity index 98% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/ValidationUtil.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/ValidationUtil.java index 846df246168c..f659197ba2a7 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/ValidationUtil.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/ValidationUtil.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.implementation.util; +package com.azure.v2.core.implementation.identity.util; -import com.azure.v2.identity.implementation.models.ManagedIdentityClientOptions; +import com.azure.v2.core.implementation.identity.models.ManagedIdentityClientOptions; import io.clientcore.core.instrumentation.logging.ClientLogger; import java.net.URI; diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/package-info.java b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/package-info.java similarity index 75% rename from sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/package-info.java rename to sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/package-info.java index 35e8cc6d4c17..2952e0828d4a 100644 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/implementation/util/package-info.java +++ b/sdk/core-v2/azure-core/src/main/java/com/azure/v2/core/implementation/identity/util/package-info.java @@ -4,4 +4,4 @@ /** * Package containing utility classes for credentials and clients */ -package com.azure.v2.identity.implementation.util; +package com.azure.v2.core.implementation.identity.util; diff --git a/sdk/core-v2/azure-core/src/main/java/module-info.java b/sdk/core-v2/azure-core/src/main/java/module-info.java index 77beb327319c..1608b479e26c 100644 --- a/sdk/core-v2/azure-core/src/main/java/module-info.java +++ b/sdk/core-v2/azure-core/src/main/java/module-info.java @@ -7,10 +7,18 @@ module com.azure.v2.core { requires transitive io.clientcore.core; + requires com.microsoft.aad.msal4j; + requires msal4j.persistence.extension; + requires com.sun.jna; + requires com.sun.jna.platform; + requires java.xml; + // public API surface area exports com.azure.v2.core.credentials; exports com.azure.v2.core.http.pipeline; exports com.azure.v2.core.http.polling; + exports com.azure.v2.core.identity; + exports com.azure.v2.core.identity.models; exports com.azure.v2.core.models; exports com.azure.v2.core.traits; } diff --git a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AuthenticationRecordTest.java b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AuthenticationRecordTest.java similarity index 82% rename from sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AuthenticationRecordTest.java rename to sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AuthenticationRecordTest.java index dad91f229c6a..a6d45b775f79 100644 --- a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AuthenticationRecordTest.java +++ b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AuthenticationRecordTest.java @@ -1,12 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.models.AuthenticationRecord; +import com.azure.v2.core.identity.models.AuthenticationRecord; import org.junit.jupiter.api.Test; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AuthorizationCodeCredentialTest.java b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AuthorizationCodeCredentialTest.java similarity index 96% rename from sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AuthorizationCodeCredentialTest.java rename to sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AuthorizationCodeCredentialTest.java index 86f1c31c761c..0e8fcd65c11b 100644 --- a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AuthorizationCodeCredentialTest.java +++ b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AuthorizationCodeCredentialTest.java @@ -1,12 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.implementation.client.PublicClient; -import com.azure.v2.identity.util.TestUtils; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.implementation.identity.client.PublicClient; import io.clientcore.core.credentials.oauth.AccessToken; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzureCliCredentialNegativeTest.java b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzureCliCredentialNegativeTest.java similarity index 92% rename from sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzureCliCredentialNegativeTest.java rename to sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzureCliCredentialNegativeTest.java index 70a5202ab8be..1e3212479e96 100644 --- a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzureCliCredentialNegativeTest.java +++ b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzureCliCredentialNegativeTest.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; import com.azure.v2.core.credentials.TokenRequestContext; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; diff --git a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzureCliCredentialTest.java b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzureCliCredentialTest.java similarity index 96% rename from sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzureCliCredentialTest.java rename to sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzureCliCredentialTest.java index 7ff800f3ca11..ef68816ef224 100644 --- a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzureCliCredentialTest.java +++ b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzureCliCredentialTest.java @@ -1,14 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.implementation.client.DevToolsClient; -import com.azure.v2.identity.implementation.models.DevToolsClientOptions; -import com.azure.v2.identity.implementation.util.IdentityUtil; -import com.azure.v2.identity.util.TestUtils; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.implementation.identity.client.DevToolsClient; +import com.azure.v2.core.implementation.identity.models.DevToolsClientOptions; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; import io.clientcore.core.credentials.oauth.AccessToken; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzureDeveloperCliCredentialNegativeTest.java b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzureDeveloperCliCredentialNegativeTest.java similarity index 92% rename from sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzureDeveloperCliCredentialNegativeTest.java rename to sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzureDeveloperCliCredentialNegativeTest.java index 2d4ee63f6879..064345be0968 100644 --- a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzureDeveloperCliCredentialNegativeTest.java +++ b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzureDeveloperCliCredentialNegativeTest.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; import com.azure.v2.core.credentials.TokenRequestContext; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; diff --git a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzureDeveloperCliCredentialTest.java b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzureDeveloperCliCredentialTest.java similarity index 93% rename from sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzureDeveloperCliCredentialTest.java rename to sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzureDeveloperCliCredentialTest.java index cf0f924fc88c..50f384229529 100644 --- a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzureDeveloperCliCredentialTest.java +++ b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzureDeveloperCliCredentialTest.java @@ -1,13 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.implementation.client.DevToolsClient; -import com.azure.v2.identity.implementation.models.DevToolsClientOptions; -import com.azure.v2.identity.util.TestUtils; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.implementation.identity.client.DevToolsClient; +import com.azure.v2.core.implementation.identity.models.DevToolsClientOptions; import io.clientcore.core.credentials.oauth.AccessToken; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzurePipelinesCredentialBuilderTest.java b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzurePipelinesCredentialBuilderTest.java similarity index 97% rename from sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzurePipelinesCredentialBuilderTest.java rename to sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzurePipelinesCredentialBuilderTest.java index 0af3b39a4f1b..1e6b293b533f 100644 --- a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzurePipelinesCredentialBuilderTest.java +++ b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzurePipelinesCredentialBuilderTest.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; import io.clientcore.core.utils.configuration.Configuration; import io.clientcore.core.utils.configuration.ConfigurationSource; diff --git a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzurePowerShellCredentialNegativeTest.java b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzurePowerShellCredentialNegativeTest.java similarity index 89% rename from sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzurePowerShellCredentialNegativeTest.java rename to sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzurePowerShellCredentialNegativeTest.java index b944ad8a3685..28e8da37d937 100644 --- a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzurePowerShellCredentialNegativeTest.java +++ b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzurePowerShellCredentialNegativeTest.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; import com.azure.v2.core.credentials.TokenRequestContext; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; diff --git a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzurePowerShellCredentialTest.java b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzurePowerShellCredentialTest.java similarity index 89% rename from sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzurePowerShellCredentialTest.java rename to sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzurePowerShellCredentialTest.java index 9257110c0b89..9f69ed1aa97e 100644 --- a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/AzurePowerShellCredentialTest.java +++ b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/AzurePowerShellCredentialTest.java @@ -1,13 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.implementation.client.DevToolsClient; -import com.azure.v2.identity.implementation.models.DevToolsClientOptions; -import com.azure.v2.identity.util.TestUtils; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.implementation.identity.client.DevToolsClient; +import com.azure.v2.core.implementation.identity.models.DevToolsClientOptions; import io.clientcore.core.credentials.oauth.AccessToken; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/ClientCertificateCredentialTest.java b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/ClientCertificateCredentialTest.java similarity index 99% rename from sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/ClientCertificateCredentialTest.java rename to sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/ClientCertificateCredentialTest.java index 53b47f3d58ab..e2f051f24c1f 100644 --- a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/ClientCertificateCredentialTest.java +++ b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/ClientCertificateCredentialTest.java @@ -1,12 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.implementation.client.ConfidentialClient; -import com.azure.v2.identity.util.TestUtils; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.implementation.identity.client.ConfidentialClient; import com.microsoft.aad.msal4j.MsalServiceException; import io.clientcore.core.credentials.oauth.AccessToken; import org.junit.jupiter.api.Assertions; diff --git a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/ClientSecretCredentialTest.java b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/ClientSecretCredentialTest.java similarity index 97% rename from sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/ClientSecretCredentialTest.java rename to sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/ClientSecretCredentialTest.java index 2d9365f1e6d9..23d3a79f5890 100644 --- a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/ClientSecretCredentialTest.java +++ b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/ClientSecretCredentialTest.java @@ -1,12 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.implementation.client.ConfidentialClient; -import com.azure.v2.identity.util.TestUtils; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.implementation.identity.client.ConfidentialClient; import com.microsoft.aad.msal4j.MsalServiceException; import io.clientcore.core.credentials.oauth.AccessToken; import org.junit.jupiter.api.Assertions; diff --git a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/DeviceCodeCredentialTest.java b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/DeviceCodeCredentialTest.java similarity index 96% rename from sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/DeviceCodeCredentialTest.java rename to sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/DeviceCodeCredentialTest.java index 4a8ee15eac78..a9d3054fae2e 100644 --- a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/DeviceCodeCredentialTest.java +++ b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/DeviceCodeCredentialTest.java @@ -1,14 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.implementation.client.PublicClient; -import com.azure.v2.identity.models.AuthenticationRecord; -import com.azure.v2.identity.models.DeviceCodeInfo; -import com.azure.v2.identity.util.TestUtils; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.implementation.identity.client.PublicClient; +import com.azure.v2.core.identity.models.AuthenticationRecord; +import com.azure.v2.core.identity.models.DeviceCodeInfo; import io.clientcore.core.credentials.oauth.AccessToken; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/EnvironmentCredentialTests.java b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/EnvironmentCredentialTests.java similarity index 94% rename from sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/EnvironmentCredentialTests.java rename to sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/EnvironmentCredentialTests.java index b4f4cf266c16..9f2a5bb20ee5 100644 --- a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/EnvironmentCredentialTests.java +++ b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/EnvironmentCredentialTests.java @@ -1,13 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.exceptions.CredentialAuthenticationException; -import com.azure.v2.identity.implementation.util.IdentityUtil; -import com.azure.v2.identity.util.TestConfigurationSource; -import com.azure.v2.identity.util.TestUtils; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.identity.models.CredentialAuthenticationException; +import com.azure.v2.core.implementation.identity.util.IdentityUtil; import io.clientcore.core.utils.configuration.Configuration; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/InteractiveBrowserCredentialTest.java b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/InteractiveBrowserCredentialTest.java similarity index 98% rename from sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/InteractiveBrowserCredentialTest.java rename to sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/InteractiveBrowserCredentialTest.java index 871f90c9636d..5c28a4663c52 100644 --- a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/InteractiveBrowserCredentialTest.java +++ b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/InteractiveBrowserCredentialTest.java @@ -1,12 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.client.PublicClient; -import com.azure.v2.identity.models.AuthenticationRecord; -import com.azure.v2.identity.util.TestUtils; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.implementation.identity.client.PublicClient; +import com.azure.v2.core.identity.models.AuthenticationRecord; import io.clientcore.core.credentials.oauth.AccessToken; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/ManagedIdentityCredentialTest.java b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/ManagedIdentityCredentialTest.java similarity index 91% rename from sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/ManagedIdentityCredentialTest.java rename to sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/ManagedIdentityCredentialTest.java index 6af4251d3c39..019360c20705 100644 --- a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/ManagedIdentityCredentialTest.java +++ b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/ManagedIdentityCredentialTest.java @@ -1,12 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.client.ManagedIdentityClient; -import com.azure.v2.identity.util.TestConfigurationSource; -import com.azure.v2.identity.util.TestUtils; import com.azure.v2.core.credentials.TokenRequestContext; +import com.azure.v2.core.implementation.identity.client.ManagedIdentityClient; import io.clientcore.core.credentials.oauth.AccessToken; import io.clientcore.core.utils.configuration.Configuration; import org.junit.jupiter.api.Assertions; diff --git a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/util/TestConfigurationSource.java b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/TestConfigurationSource.java similarity index 95% rename from sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/util/TestConfigurationSource.java rename to sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/TestConfigurationSource.java index 81b111738a7f..f4299e010f78 100644 --- a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/util/TestConfigurationSource.java +++ b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/TestConfigurationSource.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.util; +package com.azure.v2.core.identity; import io.clientcore.core.utils.configuration.ConfigurationSource; diff --git a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/util/TestUtils.java b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/TestUtils.java similarity index 98% rename from sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/util/TestUtils.java rename to sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/TestUtils.java index 6ffe59ad0ff0..488f105127de 100644 --- a/sdk/identity-v2/azure-identity/src/test/java/com/azure/v2/identity/util/TestUtils.java +++ b/sdk/core-v2/azure-core/src/test/java/com/azure/v2/core/identity/TestUtils.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.v2.identity.util; +package com.azure.v2.core.identity; -import com.azure.v2.identity.implementation.models.MsalToken; +import com.azure.v2.core.implementation.identity.models.MsalToken; import com.microsoft.aad.msal4j.AuthenticationResultMetadata; import com.microsoft.aad.msal4j.IAccount; import com.microsoft.aad.msal4j.IAuthenticationResult; diff --git a/sdk/core-v2/ci.yml b/sdk/core-v2/ci.yml index cc55a72eb385..31c34fc6d48c 100644 --- a/sdk/core-v2/ci.yml +++ b/sdk/core-v2/ci.yml @@ -56,3 +56,34 @@ extends: safeName: azurecoretest skipPublishDocMs: true releaseInBatch: ${{ parameters.release_azurecoretest }} + LiveTestStages: + - template: /eng/pipelines/templates/stages/archetype-sdk-tests-isolated.yml + parameters: + PreTestRunSteps: + - task: AzureCLI@2 + displayName: Refresh OIDC token + env: + ARM_OIDC_TOKEN: $(ARM_OIDC_TOKEN) + inputs: + azureSubscription: azure-sdk-tests-public + addSpnToEnvironment: true + scriptLocation: inlineScript + scriptType: pscore + inlineScript: | + Write-Host "##vso[task.setvariable variable=ARM_OIDC_TOKEN;issecret=true]$($env:idToken)" + PersistOidcToken: true + Location: 'westus2' + CalledFromClient: true + ServiceDirectory: core-v2 + EnvVars: + AZ_OIDC_TOKEN: $(ARM_OIDC_TOKEN) + AZURE_IDENTITY_MULTI_TENANT_CLIENT_SECRET: $(AZURE-IDENTITY-MULTI-TENANT-CLIENT-SECRET) + CloudConfig: + Public: + SubscriptionConfigurations: + - $(sub-config-identity-test-resources) + Artifacts: + - name: azure-core + groupId: com.azure.v2 + safeName: azurecore + skipPublishDocMs: true diff --git a/sdk/identity-v2/azure-identity/CHANGELOG.md b/sdk/identity-v2/azure-identity/CHANGELOG.md deleted file mode 100644 index 567d6975765a..000000000000 --- a/sdk/identity-v2/azure-identity/CHANGELOG.md +++ /dev/null @@ -1,11 +0,0 @@ -# Release History - -## 2.0.0-beta.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes diff --git a/sdk/identity-v2/azure-identity/README.md b/sdk/identity-v2/azure-identity/README.md deleted file mode 100644 index f69486778d5b..000000000000 --- a/sdk/identity-v2/azure-identity/README.md +++ /dev/null @@ -1,49 +0,0 @@ -# Azure Identity client library for Java - -The Azure Identity V2 library provides [Microsoft Entra ID](https://learn.microsoft.com/entra/fundamentals/whatis) token-based authentication support across the Azure SDK. - -## Getting started - -### Include the package - -#### Include the BOM file - -#### Include direct dependency - -To take dependency on a particular version of the library that isn't present in the BOM, add the direct dependency to your project as follows: - -[//]: # ({x-version-update-start;com.azure:azure-identity-v2;dependency}) -```xml - - com.azure - azure-identity-v2 - 2.0.0-beta.1 - -``` -[//]: # ({x-version-update-end}) - -### Prerequisites - -### Authenticate the client - -## Key concepts - -## Examples - - -## Troubleshooting - - -## Next steps - - -## Contributing - -This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit https://cla.microsoft.com. - -When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repos using our CLA. - -This project has adopted the [Microsoft Open Source Code of Conduct][code_of_conduct]. For more information, see the Code of Conduct FAQ or contact opencode@microsoft.com with any additional questions or comments. - - -[code_of_conduct]: https://opensource.microsoft.com/codeofconduct/ diff --git a/sdk/identity-v2/azure-identity/checkstyle-suppressions.xml b/sdk/identity-v2/azure-identity/checkstyle-suppressions.xml deleted file mode 100644 index 3e12a71c0318..000000000000 --- a/sdk/identity-v2/azure-identity/checkstyle-suppressions.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/sdk/identity-v2/azure-identity/pom.xml b/sdk/identity-v2/azure-identity/pom.xml deleted file mode 100644 index daf7614bc1cc..000000000000 --- a/sdk/identity-v2/azure-identity/pom.xml +++ /dev/null @@ -1,138 +0,0 @@ - - 4.0.0 - - - com.azure.v2 - azure-client-sdk-parent - 2.0.0-beta.2 - ../../parents/azure-client-sdk-parent-v2 - - - com.azure.v2 - azure-identity - jar - 2.0.0-beta.1 - - Microsoft Azure Identity V2 Library - This package contains core types for Azure Java V2 clients. - https://github.com/Azure/azure-sdk-for-java - - - - The MIT License (MIT) - http://opensource.org/licenses/MIT - repo - - - - - - azure-java-build-docs - ${site.url}/site/${project.artifactId} - - - - - https://github.com/Azure/azure-sdk-for-java - scm:git:https://github.com/Azure/azure-sdk-for-java.git - scm:git:https://github.com/Azure/azure-sdk-for-java.git - - - - UTF-8 - - 0.10 - 0.10 - - - - - microsoft - Microsoft - - - - - - - io.clientcore - core - 1.0.0-beta.11 - - - - com.azure.v2 - azure-core - 2.0.0-beta.1 - - - - com.microsoft.azure - msal4j-persistence-extension - 1.3.0 - - - - com.microsoft.azure - msal4j - 1.23.1 - - - - org.junit.jupiter - junit-jupiter-api - 5.13.4 - test - - - - org.junit.jupiter - junit-jupiter-engine - 5.13.4 - test - - - - org.junit.jupiter - junit-jupiter-params - 5.13.4 - test - - - - org.mockito - mockito-inline - 4.11.0 - test - - - - net.bytebuddy - byte-buddy - 1.17.7 - test - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.6.1 - - - - - com.microsoft.azure:msal4j:[1.23.1] - com.microsoft.azure:msal4j-persistence-extension:[1.3.0] - - - - - - - - - diff --git a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/exceptions/package-info.java b/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/exceptions/package-info.java deleted file mode 100644 index 6a082461edfc..000000000000 --- a/sdk/identity-v2/azure-identity/src/main/java/com/azure/v2/identity/exceptions/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -/** - * Package containing exception classes. - */ -package com.azure.v2.identity.exceptions; diff --git a/sdk/identity-v2/azure-identity/src/main/java/module-info.java b/sdk/identity-v2/azure-identity/src/main/java/module-info.java deleted file mode 100644 index 162b7f79fc2d..000000000000 --- a/sdk/identity-v2/azure-identity/src/main/java/module-info.java +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -module com.azure.v2.identity { - requires transitive com.azure.v2.core; - - requires com.microsoft.aad.msal4j; - requires msal4j.persistence.extension; - requires com.sun.jna; - requires com.sun.jna.platform; - requires java.xml; - - exports com.azure.v2.identity; - exports com.azure.v2.identity.exceptions; - exports com.azure.v2.identity.models; -} diff --git a/sdk/identity-v2/ci.yml b/sdk/identity-v2/ci.yml deleted file mode 100644 index 77353f83ac43..000000000000 --- a/sdk/identity-v2/ci.yml +++ /dev/null @@ -1,79 +0,0 @@ -# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file. - -trigger: - branches: - include: - - main - - hotfix/* - - release/* - paths: - include: - - sdk/identity-v2/ci.yml - - sdk/identity-v2/azure-identity/ - -pr: - branches: - include: - - main - - feature/* - - hotfix/* - - release/* - paths: - include: - - sdk/identity-v2/ci.yml - - sdk/identity-v2/azure-identity/ - -parameters: - - name: release_dependsonlivetests - displayName: 'Release depends on live tests' - type: boolean - default: true - - name: release_azureidentity - displayName: 'com.azure.v2:azure-identity' - type: boolean - default: true - -extends: - template: /eng/pipelines/templates/stages/archetype-sdk-client.yml - parameters: - ServiceDirectory: identity-v2 - TimeoutInMinutes: 90 - ReleaseDependsOnLiveTests: ${{ parameters.release_dependsonlivetests }} - Artifacts: - - name: azure-identity - groupId: com.azure.v2 - safeName: azureidentityv2 - skipPublishDocMs: true - releaseInBatch: ${{ parameters.release_azureidentity }} - LiveTestStages: - - template: /eng/pipelines/templates/stages/archetype-sdk-tests-isolated.yml - parameters: - PreTestRunSteps: - - task: AzureCLI@2 - displayName: Refresh OIDC token - env: - ARM_OIDC_TOKEN: $(ARM_OIDC_TOKEN) - inputs: - azureSubscription: azure-sdk-tests-public - addSpnToEnvironment: true - scriptLocation: inlineScript - scriptType: pscore - inlineScript: | - Write-Host "##vso[task.setvariable variable=ARM_OIDC_TOKEN;issecret=true]$($env:idToken)" - PersistOidcToken: true - Location: 'westus2' - CalledFromClient: true - ServiceDirectory: identity - EnvVars: - AZ_OIDC_TOKEN: $(ARM_OIDC_TOKEN) - AZURE_IDENTITY_MULTI_TENANT_CLIENT_SECRET: $(AZURE-IDENTITY-MULTI-TENANT-CLIENT-SECRET) - CloudConfig: - Public: - SubscriptionConfigurations: - - $(sub-config-identity-test-resources) - Artifacts: - - name: azure-identity - groupId: com.azure.v2 - safeName: azureidentityv2 - skipPublishDocMs: true - diff --git a/sdk/identity-v2/pom.xml b/sdk/identity-v2/pom.xml deleted file mode 100644 index e51838cc9e45..000000000000 --- a/sdk/identity-v2/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - com.azure.v2 - azure-identity-v2-service - pom - 1.0.0 - - - azure-identity - - diff --git a/sdk/keyvault-v2/TROUBLESHOOTING.md b/sdk/keyvault-v2/TROUBLESHOOTING.md index b5a815026376..5a39e832d4a9 100644 --- a/sdk/keyvault-v2/TROUBLESHOOTING.md +++ b/sdk/keyvault-v2/TROUBLESHOOTING.md @@ -41,7 +41,7 @@ com.azure.v2.core.exception.HttpResponseException: Status code 401, "{"error":{" This is most often caused by being logged into a different tenant than the Key Vault authenticates. See our [DefaultAzureCredential] documentation to see the order credentials are read. You may be logged into a different tenant for one credential that gets read before another credential. For example, you might be logged into Visual Studio under the wrong tenant even though you're logged into the Azure CLI under the correct tenant. -Automatic tenant discovery support has been added when referencing package `azure-identity` version 1.4.0 or newer, and any of the following Key Vault SDK package versions or newer: +Automatic tenant discovery support has been added when referencing package `azure-core` version 1.4.0 or newer, and any of the following Key Vault SDK package versions or newer: | Package | Minimum Version | |------------------------------------------|-----------------| @@ -80,7 +80,7 @@ The operation and inner `code` may vary, but the rest of the text will indicate [INFO] c.azure.identity.DefaultAzureCredential : Azure Identity => Attempted credential ManagedIdentityCredential is unavailable. [ERROR] c.a.identity.SharedTokenCacheCredential : Azure Identity => ERROR in getToken() call for scopes [https://management.core.windows.net//.default]: SharedTokenCacheCredential authentication unavailable. No accounts were found in the cache. [INFO] c.azure.identity.DefaultAzureCredential : Azure Identity => Attempted credential SharedTokenCacheCredential is unavailable. - [ERROR] com.azure.v2.identity.IntelliJCredential : Azure Identity => ERROR in getToken() call for scopes [https://management.core.windows.net//.default]: Unrecognized field "tenantId" (class com.azure.v2.identity.implementation.IntelliJAuthMethodDetails), not marked as ignorable (4 known properties: "authMethod", "azureEnv", "accountEmail", "credFilePath"]) + [ERROR] com.azure.v2.core.identity.IntelliJCredential : Azure Identity => ERROR in getToken() call for scopes [https://management.core.windows.net//.default]: Unrecognized field "tenantId" (class com.azure.v2.core.implementation.identity.IntelliJAuthMethodDetails), not marked as ignorable (4 known properties: "authMethod", "azureEnv", "accountEmail", "credFilePath"]) ``` #### Access Denied to First Party Service @@ -120,7 +120,7 @@ Check that the resource is expected - that you're not receiving an authenticatio ```java import com.azure.v2.core.TokenCredential; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.secrets.SecretClient; import com.azure.v2.security.keyvault.secrets.SecretClientBuilder; @@ -159,16 +159,16 @@ For additional support, please search our [existing issues](https://github.com/A [access_policies]: https://docs.microsoft.com/azure/key-vault/general/assign-access-policy [azure_appconfiguration]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/appconfiguration/azure-data-appconfiguration/README.md -[azure-identity]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/identity/azure-identity/README.md -[DefaultAzureCredential]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/identity/azure-identity/README.md#defaultazurecredential +[azure-identity]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/core-v2/azure-core/README.md +[DefaultAzureCredential]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/core-v2/azure-core/README.md#defaultazurecredential [kv_admin_troubleshooting]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/keyvault-v2/azure-security-keyvault-administration/TROUBLESHOOTING.md [kv_certs_troubleshooting]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/keyvault-v2/azure-security-keyvault-certificates/TROUBLESHOOTING.md [kv_error_codes]: https://docs.microsoft.com/azure/key-vault/general/rest-error-codes [kv_keys_troubleshooting]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/keyvault-v2/azure-security-keyvault-keys/TROUBLESHOOTING.md [kv_secrets_troubleshooting]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/keyvault-v2/azure-security-keyvault-secrets/TROUBLESHOOTING.md [identity_logging]: https://docs.microsoft.com/azure/developer/java/sdk/logging-overview -[identity_troubleshooting]: https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/identity/azure-identity/TROUBLESHOOTING.md -[identity_multitenant]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/identity/azure-identity/TROUBLESHOOTING.md#troubleshoot-multi-tenant-authentication-issues +[identity_troubleshooting]: https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/core-v2/azure-core/TROUBLESHOOTING.md +[identity_multitenant]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/core-v2/azure-core/TROUBLESHOOTING.md#troubleshoot-multi-tenant-authentication-issues [rbac]: https://docs.microsoft.com/azure/key-vault/general/rbac-guide [release_notes_resource]: https://aka.ms/azsdk/blog/vault-uri [release_notes_tenant]: https://aka.ms/azsdk/blog/multi-tenant-guidance diff --git a/sdk/keyvault-v2/azure-security-keyvault-administration/README.md b/sdk/keyvault-v2/azure-security-keyvault-administration/README.md index 0e9295ec98ba..930c669f88da 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-administration/README.md +++ b/sdk/keyvault-v2/azure-security-keyvault-administration/README.md @@ -507,7 +507,7 @@ For details on contributing to this repository, see the [contributing guide][con [azure_keyvault_rest]: https://learn.microsoft.com/rest/api/keyvault/ [azure_ca]: https://learn.microsoft.com/azure/security/fundamentals/azure-ca-details?tabs=root-and-subordinate-cas-list#client-compatibility-for-public-pkis [azure_cli]: https://learn.microsoft.com/cli/azure -[azure_identity]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/identity/azure-identity +[azure_identity]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/core-v2/azure-core [azure_keyvault]: https://learn.microsoft.com/azure/key-vault/general/overview [azure_keyvault_cli]: https://learn.microsoft.com/azure/key-vault/general/quick-create-cli [azure_keyvault_mhsm_cli]: https://learn.microsoft.com/azure/key-vault/managed-hsm/quick-create-cli diff --git a/sdk/keyvault-v2/azure-security-keyvault-administration/pom.xml b/sdk/keyvault-v2/azure-security-keyvault-administration/pom.xml index 8783eb6b4afb..bd48b3dd0405 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-administration/pom.xml +++ b/sdk/keyvault-v2/azure-security-keyvault-administration/pom.xml @@ -69,14 +69,6 @@ Licensed under the MIT License. azure-core 2.0.0-beta.1 - - - - com.azure.v2 - azure-identity - 2.0.0-beta.1 - test - diff --git a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/AccessControlHelloWorld.java b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/AccessControlHelloWorld.java index 8642e8be9757..ebb757f90723 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/AccessControlHelloWorld.java +++ b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/AccessControlHelloWorld.java @@ -3,7 +3,7 @@ package com.azure.v2.security.keyvault.administration; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.administration.models.KeyVaultRoleAssignment; import com.azure.v2.security.keyvault.administration.models.KeyVaultRoleDefinition; import com.azure.v2.security.keyvault.administration.models.KeyVaultRoleScope; diff --git a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/BackupAndRestoreHelloWorld.java b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/BackupAndRestoreHelloWorld.java index 150cb324cf01..4e528a0e9622 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/BackupAndRestoreHelloWorld.java +++ b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/BackupAndRestoreHelloWorld.java @@ -4,7 +4,7 @@ package com.azure.v2.security.keyvault.administration; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.administration.models.KeyVaultBackupOperation; import com.azure.v2.security.keyvault.administration.models.KeyVaultRestoreOperation; import com.azure.v2.security.keyvault.administration.models.KeyVaultRestoreResult; diff --git a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/CreateRoleAssignmentsForDifferentScopes.java b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/CreateRoleAssignmentsForDifferentScopes.java index e6094178ff47..f7352d041b8d 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/CreateRoleAssignmentsForDifferentScopes.java +++ b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/CreateRoleAssignmentsForDifferentScopes.java @@ -3,7 +3,7 @@ package com.azure.v2.security.keyvault.administration; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.administration.models.KeyVaultRoleAssignment; import com.azure.v2.security.keyvault.administration.models.KeyVaultRoleScope; diff --git a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/ReadmeSamples.java b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/ReadmeSamples.java index 54f65beb9362..9c7b944245ea 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/ReadmeSamples.java +++ b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/ReadmeSamples.java @@ -6,7 +6,7 @@ import com.azure.v2.core.http.polling.LongRunningOperationStatus; import com.azure.v2.core.http.polling.PollResponse; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.administration.models.KeyVaultBackupOperation; import com.azure.v2.security.keyvault.administration.models.KeyVaultGetSettingsResult; import com.azure.v2.security.keyvault.administration.models.KeyVaultRestoreOperation; diff --git a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/SelectiveKeyRestore.java b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/SelectiveKeyRestore.java index 9ead621e4059..d226032e1374 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/SelectiveKeyRestore.java +++ b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/SelectiveKeyRestore.java @@ -4,7 +4,7 @@ package com.azure.v2.security.keyvault.administration; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.administration.models.KeyVaultSelectiveKeyRestoreOperation; import com.azure.v2.security.keyvault.administration.models.KeyVaultSelectiveKeyRestoreResult; diff --git a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/SettingsHelloWorld.java b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/SettingsHelloWorld.java index 90df327460f5..138b5b50f1a5 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/SettingsHelloWorld.java +++ b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/SettingsHelloWorld.java @@ -3,7 +3,7 @@ package com.azure.v2.security.keyvault.administration; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.administration.models.KeyVaultGetSettingsResult; import com.azure.v2.security.keyvault.administration.models.KeyVaultSetting; diff --git a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/codesnippets/KeyVaultAccessControlClientJavaDocCodeSnippets.java b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/codesnippets/KeyVaultAccessControlClientJavaDocCodeSnippets.java index 3e19cb87c82d..ada4b69bb335 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/codesnippets/KeyVaultAccessControlClientJavaDocCodeSnippets.java +++ b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/codesnippets/KeyVaultAccessControlClientJavaDocCodeSnippets.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. package com.azure.v2.security.keyvault.administration.codesnippets; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.administration.KeyVaultAccessControlClient; import com.azure.v2.security.keyvault.administration.KeyVaultAccessControlClientBuilder; import com.azure.v2.security.keyvault.administration.models.KeyVaultDataAction; diff --git a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/codesnippets/KeyVaultBackupClientJavaDocCodeSnippets.java b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/codesnippets/KeyVaultBackupClientJavaDocCodeSnippets.java index a654888159c3..cece1c8bf492 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/codesnippets/KeyVaultBackupClientJavaDocCodeSnippets.java +++ b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/codesnippets/KeyVaultBackupClientJavaDocCodeSnippets.java @@ -5,7 +5,7 @@ import com.azure.v2.core.http.polling.LongRunningOperationStatus; import com.azure.v2.core.http.polling.PollResponse; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.administration.KeyVaultBackupClient; import com.azure.v2.security.keyvault.administration.KeyVaultBackupClientBuilder; import com.azure.v2.security.keyvault.administration.models.KeyVaultBackupOperation; diff --git a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/codesnippets/KeyVaultSettingsClientJavaDocCodeSnippets.java b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/codesnippets/KeyVaultSettingsClientJavaDocCodeSnippets.java index 705883787064..49c8960239cb 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/codesnippets/KeyVaultSettingsClientJavaDocCodeSnippets.java +++ b/sdk/keyvault-v2/azure-security-keyvault-administration/src/samples/java/com/azure/v2/security/keyvault/administration/codesnippets/KeyVaultSettingsClientJavaDocCodeSnippets.java @@ -3,7 +3,7 @@ package com.azure.v2.security.keyvault.administration.codesnippets; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.administration.KeyVaultSettingsClient; import com.azure.v2.security.keyvault.administration.KeyVaultSettingsClientBuilder; import com.azure.v2.security.keyvault.administration.models.KeyVaultGetSettingsResult; diff --git a/sdk/keyvault-v2/azure-security-keyvault-certificates/README.md b/sdk/keyvault-v2/azure-security-keyvault-certificates/README.md index eefd33d48cf6..4fbc3b995bf9 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-certificates/README.md +++ b/sdk/keyvault-v2/azure-security-keyvault-certificates/README.md @@ -265,7 +265,7 @@ For details on contributing to this repository, see the [contributing guide][con [azure_keyvault_docs]: https://learn.microsoft.com/azure/key-vault/ [azure_keyvault_rest]: https://learn.microsoft.com/rest/api/keyvault/ [azure_ca]: https://learn.microsoft.com/azure/security/fundamentals/azure-ca-details?tabs=root-and-subordinate-cas-list#client-compatibility-for-public-pkis -[azure_identity]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/identity/azure-identity +[azure_identity]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/core-v2/azure-core [azure_keyvault]: https://learn.microsoft.com/azure/key-vault/general/overview [azure_keyvault_cli]: https://learn.microsoft.com/azure/key-vault/general/quick-create-cli [azure_keyvault_portal]: https://learn.microsoft.com/azure/key-vault/general/quick-create-portal diff --git a/sdk/keyvault-v2/azure-security-keyvault-certificates/pom.xml b/sdk/keyvault-v2/azure-security-keyvault-certificates/pom.xml index 3c19cd8772aa..628a99dcd6ae 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-certificates/pom.xml +++ b/sdk/keyvault-v2/azure-security-keyvault-certificates/pom.xml @@ -69,14 +69,6 @@ Licensed under the MIT License. azure-core 2.0.0-beta.1 - - - - com.azure.v2 - azure-identity - 2.0.0-beta.1 - test - diff --git a/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/BackupAndRestoreOperations.java b/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/BackupAndRestoreOperations.java index f1f2e29d5aa4..daef7727fa33 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/BackupAndRestoreOperations.java +++ b/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/BackupAndRestoreOperations.java @@ -6,7 +6,7 @@ import com.azure.v2.core.http.polling.LongRunningOperationStatus; import com.azure.v2.core.http.polling.PollResponse; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.certificates.models.CertificateKeyCurveName; import com.azure.v2.security.keyvault.certificates.models.CertificateKeyType; import com.azure.v2.security.keyvault.certificates.models.CertificateOperation; diff --git a/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/CertificateClientJavaDocCodeSnippets.java b/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/CertificateClientJavaDocCodeSnippets.java index abf489886c79..7d2e6b79c927 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/CertificateClientJavaDocCodeSnippets.java +++ b/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/CertificateClientJavaDocCodeSnippets.java @@ -6,7 +6,7 @@ import com.azure.v2.core.http.polling.LongRunningOperationStatus; import com.azure.v2.core.http.polling.PollResponse; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.certificates.models.AdministratorContact; import com.azure.v2.security.keyvault.certificates.models.CertificateContact; import com.azure.v2.security.keyvault.certificates.models.CertificateIssuer; diff --git a/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/HelloWorld.java b/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/HelloWorld.java index aa0a3e6891db..ea8beeab0d6e 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/HelloWorld.java +++ b/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/HelloWorld.java @@ -6,7 +6,7 @@ import com.azure.v2.core.http.polling.LongRunningOperationStatus; import com.azure.v2.core.http.polling.PollResponse; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.certificates.models.CertificateIssuer; import com.azure.v2.security.keyvault.certificates.models.CertificateKeyCurveName; import com.azure.v2.security.keyvault.certificates.models.CertificateKeyType; diff --git a/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/ListOperations.java b/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/ListOperations.java index e1349bd51bbf..c7cdc84e8a4f 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/ListOperations.java +++ b/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/ListOperations.java @@ -5,7 +5,7 @@ import com.azure.v2.core.http.polling.LongRunningOperationStatus; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.certificates.models.CertificateContact; import com.azure.v2.security.keyvault.certificates.models.CertificateIssuer; import com.azure.v2.security.keyvault.certificates.models.CertificateOperation; diff --git a/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/ManagingDeletedCertificates.java b/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/ManagingDeletedCertificates.java index 6308151a5fc8..6a3f1fb03733 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/ManagingDeletedCertificates.java +++ b/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/ManagingDeletedCertificates.java @@ -6,7 +6,7 @@ import com.azure.v2.core.http.polling.LongRunningOperationStatus; import com.azure.v2.core.http.polling.PollResponse; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.certificates.models.CertificateKeyCurveName; import com.azure.v2.security.keyvault.certificates.models.CertificateKeyType; import com.azure.v2.security.keyvault.certificates.models.CertificateOperation; diff --git a/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/ReadmeSamples.java b/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/ReadmeSamples.java index b4dffb255af8..3289ba40c63b 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/ReadmeSamples.java +++ b/sdk/keyvault-v2/azure-security-keyvault-certificates/src/samples/java/com/azure/v2/security/keyvault/certificates/ReadmeSamples.java @@ -6,7 +6,7 @@ import com.azure.v2.core.http.polling.LongRunningOperationStatus; import com.azure.v2.core.http.polling.PollResponse; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.certificates.models.CertificateOperation; import com.azure.v2.security.keyvault.certificates.models.CertificatePolicy; import com.azure.v2.security.keyvault.certificates.models.CertificateProperties; diff --git a/sdk/keyvault-v2/azure-security-keyvault-keys/README.md b/sdk/keyvault-v2/azure-security-keyvault-keys/README.md index 6a95152ffd07..596b7d61f3fc 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-keys/README.md +++ b/sdk/keyvault-v2/azure-security-keyvault-keys/README.md @@ -321,7 +321,7 @@ For details on contributing to this repository, see the [contributing guide][con [azure_keyvault_docs]: https://learn.microsoft.com/azure/key-vault/ [azure_keyvault_rest]: https://learn.microsoft.com/rest/api/keyvault/ [azure_ca]: https://learn.microsoft.com/azure/security/fundamentals/azure-ca-details?tabs=root-and-subordinate-cas-list#client-compatibility-for-public-pkis -[azure_identity]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/identity/azure-identity +[azure_identity]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/core-v2/azure-core [azure_keyvault]: https://learn.microsoft.com/azure/key-vault/general/overview [azure_keyvault_cli]: https://learn.microsoft.com/azure/key-vault/general/quick-create-cli [azure_keyvault_portal]: https://learn.microsoft.com/azure/key-vault/general/quick-create-portal diff --git a/sdk/keyvault-v2/azure-security-keyvault-keys/pom.xml b/sdk/keyvault-v2/azure-security-keyvault-keys/pom.xml index 49ccb52202ee..3f7ab170eb35 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-keys/pom.xml +++ b/sdk/keyvault-v2/azure-security-keyvault-keys/pom.xml @@ -69,14 +69,6 @@ Licensed under the MIT License. azure-core 2.0.0-beta.1 - - - - com.azure.v2 - azure-identity - 2.0.0-beta.1 - test - diff --git a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/BackupAndRestoreOperations.java b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/BackupAndRestoreOperations.java index d55bf6ab14fc..c9a588218710 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/BackupAndRestoreOperations.java +++ b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/BackupAndRestoreOperations.java @@ -5,7 +5,7 @@ import com.azure.v2.core.http.polling.PollResponse; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.keys.models.CreateRsaKeyOptions; import com.azure.v2.security.keyvault.keys.models.DeletedKey; import com.azure.v2.security.keyvault.keys.models.KeyVaultKey; diff --git a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/HelloWorld.java b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/HelloWorld.java index 4b00d1211785..28726217cb7d 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/HelloWorld.java +++ b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/HelloWorld.java @@ -5,7 +5,7 @@ import com.azure.v2.core.http.polling.PollResponse; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.keys.models.CreateRsaKeyOptions; import com.azure.v2.security.keyvault.keys.models.DeletedKey; import com.azure.v2.security.keyvault.keys.models.KeyOperation; diff --git a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/KeyClientJavaDocCodeSnippets.java b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/KeyClientJavaDocCodeSnippets.java index 54435e372526..f086c3b92d57 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/KeyClientJavaDocCodeSnippets.java +++ b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/KeyClientJavaDocCodeSnippets.java @@ -5,7 +5,7 @@ import com.azure.v2.core.http.polling.PollResponse; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.keys.models.CreateEcKeyOptions; import com.azure.v2.security.keyvault.keys.models.CreateKeyOptions; import com.azure.v2.security.keyvault.keys.models.CreateOctKeyOptions; diff --git a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/KeyRotation.java b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/KeyRotation.java index 23dc7d71e996..d56fe8292193 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/KeyRotation.java +++ b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/KeyRotation.java @@ -3,7 +3,7 @@ package com.azure.v2.security.keyvault.keys; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.keys.models.CreateRsaKeyOptions; import com.azure.v2.security.keyvault.keys.models.KeyRotationLifetimeAction; import com.azure.v2.security.keyvault.keys.models.KeyRotationPolicy; diff --git a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/ListOperations.java b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/ListOperations.java index c02986ad2927..4a9a77c233fc 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/ListOperations.java +++ b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/ListOperations.java @@ -3,7 +3,7 @@ package com.azure.v2.security.keyvault.keys; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.keys.models.CreateEcKeyOptions; import com.azure.v2.security.keyvault.keys.models.CreateRsaKeyOptions; import com.azure.v2.security.keyvault.keys.models.KeyProperties; diff --git a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/ManagingDeletedKeys.java b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/ManagingDeletedKeys.java index 636a33821377..ecce420c1176 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/ManagingDeletedKeys.java +++ b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/ManagingDeletedKeys.java @@ -5,7 +5,7 @@ import com.azure.v2.core.http.polling.PollResponse; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.keys.models.CreateEcKeyOptions; import com.azure.v2.security.keyvault.keys.models.CreateRsaKeyOptions; import com.azure.v2.security.keyvault.keys.models.DeletedKey; diff --git a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/ReadmeSamples.java b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/ReadmeSamples.java index ea02f3b379f7..92edb6a86a2a 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/ReadmeSamples.java +++ b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/ReadmeSamples.java @@ -5,7 +5,7 @@ import com.azure.v2.core.http.polling.PollResponse; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.keys.cryptography.CryptographyClient; import com.azure.v2.security.keyvault.keys.cryptography.CryptographyClientBuilder; import com.azure.v2.security.keyvault.keys.cryptography.models.DecryptResult; diff --git a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/cryptography/CryptographyClientJavaDocCodeSnippets.java b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/cryptography/CryptographyClientJavaDocCodeSnippets.java index df008c2263c4..0f8ac7196ff1 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/cryptography/CryptographyClientJavaDocCodeSnippets.java +++ b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/cryptography/CryptographyClientJavaDocCodeSnippets.java @@ -3,7 +3,7 @@ package com.azure.v2.security.keyvault.keys.cryptography; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.keys.KeyClient; import com.azure.v2.security.keyvault.keys.cryptography.models.DecryptParameters; import com.azure.v2.security.keyvault.keys.cryptography.models.DecryptResult; diff --git a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/cryptography/EncryptDecryptOperations.java b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/cryptography/EncryptDecryptOperations.java index 0ffc7447f5d6..9cc04782c5d8 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/cryptography/EncryptDecryptOperations.java +++ b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/cryptography/EncryptDecryptOperations.java @@ -3,7 +3,7 @@ package com.azure.v2.security.keyvault.keys.cryptography; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.keys.cryptography.models.DecryptResult; import com.azure.v2.security.keyvault.keys.cryptography.models.EncryptResult; import com.azure.v2.security.keyvault.keys.cryptography.models.EncryptionAlgorithm; diff --git a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/cryptography/KeyWrapUnwrapOperations.java b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/cryptography/KeyWrapUnwrapOperations.java index 7f8ea6df84ba..01b4d32b83a8 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/cryptography/KeyWrapUnwrapOperations.java +++ b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/cryptography/KeyWrapUnwrapOperations.java @@ -3,7 +3,7 @@ package com.azure.v2.security.keyvault.keys.cryptography; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.keys.cryptography.models.KeyWrapAlgorithm; import com.azure.v2.security.keyvault.keys.cryptography.models.UnwrapResult; import com.azure.v2.security.keyvault.keys.cryptography.models.WrapResult; diff --git a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/cryptography/SignVerifyOperations.java b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/cryptography/SignVerifyOperations.java index e9df21f422f5..410c6fb2a9aa 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/cryptography/SignVerifyOperations.java +++ b/sdk/keyvault-v2/azure-security-keyvault-keys/src/samples/java/com/azure/v2/security/keyvault/keys/cryptography/SignVerifyOperations.java @@ -3,7 +3,7 @@ package com.azure.v2.security.keyvault.keys.cryptography; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.keys.cryptography.models.SignResult; import com.azure.v2.security.keyvault.keys.cryptography.models.SignatureAlgorithm; import com.azure.v2.security.keyvault.keys.cryptography.models.VerifyResult; diff --git a/sdk/keyvault-v2/azure-security-keyvault-secrets/README.md b/sdk/keyvault-v2/azure-security-keyvault-secrets/README.md index 68e25f2923e6..f61f98255816 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-secrets/README.md +++ b/sdk/keyvault-v2/azure-security-keyvault-secrets/README.md @@ -275,7 +275,7 @@ For details on contributing to this repository, see the [contributing guide][con [azure_keyvault_docs]: https://learn.microsoft.com/azure/key-vault/ [azure_keyvault_rest]: https://learn.microsoft.com/rest/api/keyvault/ [azure_ca]: https://learn.microsoft.com/azure/security/fundamentals/azure-ca-details?tabs=root-and-subordinate-cas-list#client-compatibility-for-public-pkis -[azure_identity]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/identity/azure-identity +[azure_identity]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/core-v2/azure-core [azure_keyvault]: https://learn.microsoft.com/azure/key-vault/general/overview [azure_keyvault_cli]: https://learn.microsoft.com/azure/key-vault/general/quick-create-cli [azure_keyvault_portal]: https://learn.microsoft.com/azure/key-vault/general/quick-create-portal diff --git a/sdk/keyvault-v2/azure-security-keyvault-secrets/pom.xml b/sdk/keyvault-v2/azure-security-keyvault-secrets/pom.xml index 7c3e0c77884e..362dd4855705 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-secrets/pom.xml +++ b/sdk/keyvault-v2/azure-security-keyvault-secrets/pom.xml @@ -89,12 +89,6 @@ Licensed under the MIT License. 5.13.4 test - - com.azure.v2 - azure-identity - 2.0.0-beta.1 - test - diff --git a/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/BackupAndRestoreOperations.java b/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/BackupAndRestoreOperations.java index 473dac9d4da5..6ae41f235da3 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/BackupAndRestoreOperations.java +++ b/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/BackupAndRestoreOperations.java @@ -5,7 +5,7 @@ import com.azure.v2.core.http.polling.PollResponse; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.secrets.models.DeletedSecret; import com.azure.v2.security.keyvault.secrets.models.KeyVaultSecret; import com.azure.v2.security.keyvault.secrets.models.SecretProperties; diff --git a/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/HelloWorld.java b/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/HelloWorld.java index 5d574f850a41..a63e932ad528 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/HelloWorld.java +++ b/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/HelloWorld.java @@ -5,7 +5,7 @@ import com.azure.v2.core.http.polling.PollResponse; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.secrets.models.DeletedSecret; import com.azure.v2.security.keyvault.secrets.models.KeyVaultSecret; import com.azure.v2.security.keyvault.secrets.models.SecretProperties; diff --git a/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/ListOperations.java b/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/ListOperations.java index 752da779e1d8..9f745f8f5233 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/ListOperations.java +++ b/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/ListOperations.java @@ -3,7 +3,7 @@ package com.azure.v2.security.keyvault.secrets; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.secrets.models.KeyVaultSecret; import com.azure.v2.security.keyvault.secrets.models.SecretProperties; diff --git a/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/ManagingDeletedSecrets.java b/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/ManagingDeletedSecrets.java index 94e4c770035a..9c2fd87db121 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/ManagingDeletedSecrets.java +++ b/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/ManagingDeletedSecrets.java @@ -5,7 +5,7 @@ import com.azure.v2.core.http.polling.PollResponse; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.secrets.models.DeletedSecret; import com.azure.v2.security.keyvault.secrets.models.KeyVaultSecret; import com.azure.v2.security.keyvault.secrets.models.SecretProperties; diff --git a/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/ReadmeSamples.java b/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/ReadmeSamples.java index 6e6c30f401e7..b4a7399fb2f1 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/ReadmeSamples.java +++ b/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/ReadmeSamples.java @@ -5,7 +5,7 @@ import com.azure.v2.core.http.polling.PollResponse; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.secrets.models.DeletedSecret; import com.azure.v2.security.keyvault.secrets.models.KeyVaultSecret; import com.azure.v2.security.keyvault.secrets.models.SecretProperties; diff --git a/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/SecretClientJavaDocCodeSnippets.java b/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/SecretClientJavaDocCodeSnippets.java index d36421d799dc..4054f95de177 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/SecretClientJavaDocCodeSnippets.java +++ b/sdk/keyvault-v2/azure-security-keyvault-secrets/src/samples/java/com/azure/v2/security/keyvault/secrets/SecretClientJavaDocCodeSnippets.java @@ -5,7 +5,7 @@ import com.azure.v2.core.http.polling.PollResponse; import com.azure.v2.core.http.polling.Poller; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.secrets.models.DeletedSecret; import com.azure.v2.security.keyvault.secrets.models.KeyVaultSecret; import com.azure.v2.security.keyvault.secrets.models.SecretProperties; diff --git a/sdk/keyvault-v2/azure-security-keyvault-secrets/src/test/java/com/azure/v2/security/keyvault/secrets/SecretClientTest.java b/sdk/keyvault-v2/azure-security-keyvault-secrets/src/test/java/com/azure/v2/security/keyvault/secrets/SecretClientTest.java index faf5bc49601c..b105440515ad 100644 --- a/sdk/keyvault-v2/azure-security-keyvault-secrets/src/test/java/com/azure/v2/security/keyvault/secrets/SecretClientTest.java +++ b/sdk/keyvault-v2/azure-security-keyvault-secrets/src/test/java/com/azure/v2/security/keyvault/secrets/SecretClientTest.java @@ -3,7 +3,7 @@ package com.azure.v2.security.keyvault.secrets; -import com.azure.v2.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.core.identity.DefaultAzureCredentialBuilder; import com.azure.v2.security.keyvault.secrets.models.KeyVaultSecret; import io.clientcore.core.http.pipeline.HttpInstrumentationOptions; import org.junit.jupiter.api.Disabled; diff --git a/sdk/storage-v2/azure-storage-blob/pom.xml b/sdk/storage-v2/azure-storage-blob/pom.xml index b7df0deb1d07..1d49b33a4bc8 100644 --- a/sdk/storage-v2/azure-storage-blob/pom.xml +++ b/sdk/storage-v2/azure-storage-blob/pom.xml @@ -58,22 +58,12 @@ Code generated by Microsoft (R) TypeSpec Code Generator. azure-core 2.0.0-beta.1 - - - - com.azure.v2 - azure-identity - 2.0.0-beta.1 - test - - com.azure.v2 azure-core-test 2.0.0-beta.1 test -